From b57381cb0cdda4e3ee5f1fe2a57b2858d6eb1fdb Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Wed, 17 Apr 2019 00:04:42 +0800
Subject: [PATCH] always show aria2 status when connect aria2 via websocket

---
 src/index.html                  | 2 +-
 src/scripts/controllers/main.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/index.html b/src/index.html
index fd772f9..7ca0744 100644
--- a/src/index.html
+++ b/src/index.html
@@ -240,7 +240,7 @@
                 </li>
                 <li data-href-match="/status">
                     <a href="#!/status">
-                        <span class="label pull-right" ng-if="globalStatusContext.isEnabled" ng-class="{'label-primary': taskContext.rpcStatus === 'Connecting', 'label-success': taskContext.rpcStatus === 'Connected', 'label-danger': taskContext.rpcStatus === 'Disconnected'}" ng-bind="taskContext.rpcStatus | translate"></span>
+                        <span class="label pull-right" ng-if="globalStatusContext.isEnabled || isCurrentRpcUseWebSocket" ng-class="{'label-primary': taskContext.rpcStatus === 'Connecting', 'label-success': taskContext.rpcStatus === 'Connected', 'label-danger': taskContext.rpcStatus === 'Disconnected'}" ng-bind="taskContext.rpcStatus | translate"></span>
                         <i class="fa fa-server"></i> <span translate>Aria2 Status</span>
                     </a>
                 </li>
diff --git a/src/scripts/controllers/main.js b/src/scripts/controllers/main.js
index c9cbffc..2824e07 100644
--- a/src/scripts/controllers/main.js
+++ b/src/scripts/controllers/main.js
@@ -63,6 +63,7 @@
         $scope.quickSettingContext = null;
 
         $scope.rpcSettings = ariaNgSettingService.getAllRpcSettings();
+        $scope.isCurrentRpcUseWebSocket = ariaNgSettingService.isCurrentRpcUseWebSocket();
 
         $scope.isTaskSelected = function () {
             return $rootScope.taskContext.getSelectedTaskIds().length > 0;