From 4ca59e3186c6404ec47f75c6c78c6916efb5dfc9 Mon Sep 17 00:00:00 2001
From: Robert Sanders <rsanders@pepperdash.com>
Date: Thu, 20 Aug 2026 16:39:20 -0400
Subject: [PATCH] fix(core-ssh): harden GenericSshClient shutdown reconnect
 guards

---
 src/PepperDash.Core/Comm/GenericSshClient.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/PepperDash.Core/Comm/GenericSshClient.cs b/src/PepperDash.Core/Comm/GenericSshClient.cs
index a758378f..546a2a67 100644
--- a/src/PepperDash.Core/Comm/GenericSshClient.cs
+++ b/src/PepperDash.Core/Comm/GenericSshClient.cs
@@ -228,15 +228,14 @@ namespace PepperDash.Core
                 return;
             }
 
-            ConnectEnabled = true;
-
             if (_isProgramStopping)
             {
                 this.LogDebug("Skipping connect because program is stopping");
-                ConnectEnabled = false;
                 return;
             }
 
+            ConnectEnabled = true;
+
             try
             {
                 connectLock.Wait();
@@ -517,7 +516,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                 {
                     StartReconnectTimer();
                 }
@@ -553,7 +552,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                 {
                     StartReconnectTimer();
                 }