Bug 2228: Failure when reconnect on edited/opened file save is canceled

https://winscp.net/tracker/2228 Source commit: 2a1d1f1e033a9ccf9c7e66292d613982c0aca00c
winscp · Oct 4, 2023 · 9497660 · 9497660
1 parent 5939365
commit 9497660
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/source/forms/CustomScpExplorer.cpp b/source/forms/CustomScpExplorer.cpp
@@ -4007,8 +4007,15 @@ void __fastcall TCustomScpExplorerForm::ExecutedFileChanged(
           {
             Manager->ActiveSession = Terminal;
             ReconnectSession();
-            DebugAssert(Terminal == Data->Terminal);
-            Data->Queue = Manager->FindQueueForTerminal(Terminal);
+            // Was it reconnected? (if not, Data->Terminal should be nulled now)
+            if (IsActiveTerminal(Data->Terminal) && (Terminal == Data->Terminal))
+            {
+              Data->Queue = Manager->FindQueueForTerminal(Terminal);
+            }
+            else
+            {
+              Abort();
+            }
           }
           else
           {