Closing properly when socket comms fails

DCS-Skunkworks · Dec 3, 2023 · b5a8ae5 · b5a8ae5
1 parent 0aee0e1
commit b5a8ae5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/client/DCSInsight/Communication/TCPClientHandler.cs b/src/client/DCSInsight/Communication/TCPClientHandler.cs
@@ -101,6 +101,7 @@ private async void ClientThread()
                 catch (SocketException ex)
                 {
                     Logger.Error(ex);
+                    break;
                 }
             }
 

diff --git a/src/client/DCSInsight/MainWindow.xaml.cs b/src/client/DCSInsight/MainWindow.xaml.cs
@@ -140,6 +140,13 @@ public void ConnectionStatus(ConnectionEventArgs args)
             try
             {
                 _isConnected = args.IsConnected;
+                if (!_isConnected)
+                {
+                    Dispatcher?.BeginInvoke((Action)(Disconnect));
+                    Dispatcher?.BeginInvoke((Action)(SetFormState));
+                    return;
+                }
+
                 Dispatcher?.BeginInvoke((Action)(() => SetConnectionStatus(args.IsConnected)));
                 Dispatcher?.BeginInvoke((Action)(SetFormState)); ;
             }

diff --git a/src/client/DCSInsight/UserControls/UserControlAPI.xaml.cs b/src/client/DCSInsight/UserControls/UserControlAPI.xaml.cs
@@ -175,7 +175,6 @@ protected override void BuildUI()
                             VerticalAlignment = VerticalAlignment.Center
                         };
                         ComboBoxPollTimes.DataContextChanged += ComboBoxPollTimes_OnDataContextChanged;
-                        ComboBoxPollTimes.Items.Add(50);
                         ComboBoxPollTimes.Items.Add(100);
                         ComboBoxPollTimes.Items.Add(500);
                         ComboBoxPollTimes.Items.Add(1000);
@@ -206,15 +205,15 @@ public override void SetResult(DCSAPI dcsApi)
                 Dispatcher?.BeginInvoke((Action)(() => LabelResult.Content = $"Result ({dcsApi.ResultType})"));
 
                 var result = dcsApi.ErrorThrown ? dcsApi.ErrorMessage : (string.IsNullOrEmpty(dcsApi.Result) ? "nil" : dcsApi.Result);
-
+
+                AutoResetEventPolling.Set();
                 if (KeepResults)
                 {
                     Dispatcher?.BeginInvoke((Action)(() => TextBoxResult.Text = TextBoxResult.Text.Insert(0, "\n---\n")));
                     Dispatcher?.BeginInvoke((Action)(() => TextBoxResult.Text = TextBoxResult.Text.Insert(0, result)));
                     return;
                 }
                 Dispatcher?.BeginInvoke((Action)(() => TextBoxResult.Text = result));
-                AutoResetEventPolling.Set();
             }
             catch (Exception ex)
             {

diff --git a/src/client/DCSInsight/UserControls/UserControlLoSetCommandAPI.xaml.cs b/src/client/DCSInsight/UserControls/UserControlLoSetCommandAPI.xaml.cs
@@ -240,6 +240,8 @@ public override void SetResult(DCSAPI dcsApi)
                 Dispatcher?.BeginInvoke((Action)(() => LabelResult.Content = $"Result ({dcsApi.ResultType})"));
 
                 var result = dcsApi.ErrorThrown ? dcsApi.ErrorMessage : (string.IsNullOrEmpty(dcsApi.Result) ? "nil" : dcsApi.Result);
+
+                AutoResetEventPolling.Set();
 
                 if (KeepResults)
                 {
@@ -248,7 +250,6 @@ public override void SetResult(DCSAPI dcsApi)
                     return;
                 }
                 Dispatcher?.BeginInvoke((Action)(() => TextBoxResult.Text = result));
-                AutoResetEventPolling.Set();
             }
             catch (Exception ex)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,6 +101,7 @@ private async void ClientThread() @@
                     catch (SocketException ex)
                     {
                         Logger.Error(ex);
+                        break;
                     }
                 }
@@ Expand Down @@