src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -151,8 +151,6 @@ namespace PepperDash.Core
         // Thread-safety lock for state changes
         private readonly object _stateLock = new object();
 
-        private volatile bool _isProgramStopping;
-
         private bool disconnectLogged = false;
 
         /// <summary>
@@ -209,11 +207,13 @@ namespace PepperDash.Core
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                _isProgramStopping = true;
+                if (client != null)
+                {
                     this.LogDebug("Program stopping. Closing connection");
                     Disconnect();
                 }
             }
+        }
 
         /// <summary>
         /// Connect method
@@ -228,12 +228,6 @@ namespace PepperDash.Core
                 return;
             }
 
-            if (_isProgramStopping)
-            {
-                this.LogDebug("Skipping connect because program is stopping");
-                return;
-            }
-
             ConnectEnabled = true;
 
             try
@@ -314,7 +308,7 @@ namespace PepperDash.Core
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -326,7 +320,7 @@ namespace PepperDash.Core
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -338,7 +332,7 @@ namespace PepperDash.Core
                         this.LogVerbose(e, "Exception details: ");
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -473,7 +467,7 @@ namespace PepperDash.Core
                 {
                     connectLock.Release();
                 }
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                     StartReconnectTimer();
@@ -516,11 +510,8 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
-                {
                 StartReconnectTimer();
             }
-            }
             catch (Exception ex)
             {
                 this.LogException(ex, "Exception sending text: '{message}'", text);
@@ -552,11 +543,8 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
-                {
                 StartReconnectTimer();
             }
-            }
             catch (Exception ex)
             {
                 this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));