Diagnose set Last error to "Diagnose has been finshed" if there is no…

…t other error
ClubNation · Dec 20, 2020 · 11d9d3d · 11d9d3d
1 parent cb77490
commit 11d9d3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/VpnHood.Client.App.UI.Html/src/pages/Home.vue b/VpnHood.Client.App.UI.Html/src/pages/Home.vue
@@ -24,7 +24,7 @@
               :loading="
                 clientProfileItem_state(item) == 'Connecting' ||
                 clientProfileItem_state(item) == 'Disconnecting'
-                  ? store.state.isDiagnoseStarted
+                  ? store.state.hasDiagnoseStarted
                     ? 'warning'
                     : true
                   : false
@@ -91,7 +91,7 @@
                     </v-list-item>
 
                     <!-- Diagnose -->
-                    <v-list-item link @click="diagnose(item)">
+                    <v-list-item link @click="diagnose(item)" :disabled="store.state.hasDiagnoseStarted">
                       <v-list-item-title>{{
                         $t("diagnose")
                       }}</v-list-item-title>

diff --git a/VpnHood.Client.App/VpnHoodApp.cs b/VpnHood.Client.App/VpnHoodApp.cs
@@ -177,6 +177,11 @@ public async Task Connect(Guid clientProfileId, bool diagnose = false, string us
         {
             try
             {
+                // disconnect if user request diagnosing
+                if (diagnose && !_hasDiagnoseStarted && !IsIdle)
+                    Disconnect(true);
+
+                // check already in progress
                 if (ActiveClientProfile != null || !IsIdle)
                     throw new InvalidOperationException("Connection is already in progress!");
 
@@ -277,6 +282,10 @@ public void Disconnect(bool byUser = false)
             else if (LastException == null)
                 LastException = new Exception("No data has been arrived!");
 
+            // check diagnose
+            if (_hasDiagnoseStarted && LastException == null)
+                LastException = new Exception("Diagnose has been finished!");
+
             ActiveClientProfile = null;
 
             // close client