Bug 1684: Failure when canceling session reconnect (2nd)

https://winscp.net/tracker/1684
(cherry picked from commit ab0fe8e7d33d2894b989272630b8011cbae8fd4f)

# Conflicts:
#	source/windows/TerminalManager.cpp

Source commit: b09156f28084bfd7df5e4243efee4c8d39f94fc7

source/core/Queue.cpp

@@ -2863,11 +2863,6 @@ bool __fastcall TTerminalThread::Release()
   {
     delete this;
   }
-  else
-  {
-    // only now has the owner released ownership of the thread, so we are safe to kill outselves.
-    Terminate();
-  }
   return Result;
 }
 //---------------------------------------------------------------------------

source/forms/CustomScpExplorer.cpp

@@ -530,27 +530,22 @@ void __fastcall TCustomScpExplorerForm::SetTerminal(TTerminal * value)
   if (FTerminal != value)
   {
     TerminalChanging();
-    ReplaceTerminal(value);
-  }
-}
-//---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::ReplaceTerminal(TTerminal * value)
-{
-  FTerminal = value;
-  bool PrevAllowTransferPresetAutoSelect = FAllowTransferPresetAutoSelect;
-  FAllowTransferPresetAutoSelect = false;
-  try
-  {
-    TerminalChanged();
-  }
-  __finally
-  {
-    FAllowTransferPresetAutoSelect = PrevAllowTransferPresetAutoSelect;
-  }
+    FTerminal = value;
+    bool PrevAllowTransferPresetAutoSelect = FAllowTransferPresetAutoSelect;
+    FAllowTransferPresetAutoSelect = false;
+    try
+    {
+      TerminalChanged();
+    }
+    __finally
+    {
+      FAllowTransferPresetAutoSelect = PrevAllowTransferPresetAutoSelect;
+    }
 
-  if (Terminal != NULL)
-  {
-    TransferPresetAutoSelect();
+    if (Terminal != NULL)
+    {
+      TransferPresetAutoSelect();
+    }
   }
 }
 //---------------------------------------------------------------------------

source/forms/CustomScpExplorer.h

@@ -710,7 +710,6 @@ public:
   bool __fastcall CanChangePassword();
   void __fastcall ChangePassword();
   bool __fastcall IsComponentPossible(Byte Component);
-  void __fastcall ReplaceTerminal(TTerminal * value);
 
   __property bool ComponentVisible[Byte Component] = { read = GetComponentVisible, write = SetComponentVisible };
   __property bool EnableFocusedOperation[TOperationSide Side] = { read = GetEnableFocusedOperation, index = 0 };

source/windows/TerminalManager.cpp

@@ -273,8 +273,10 @@ void __fastcall TTerminalManager::DoConnectTerminal(TTerminal * Terminal, bool R
         Items[ActiveTerminalIndex] = Terminal;
         OwnsObjects = true;
         FActiveTerminal = Terminal;
-          // Not to call TerminalChanging() => UpdateTerminal() on a terminal that might be already released
-          FScpExplorer->ReplaceTerminal(Terminal);
+          TerminalReady();
+        // Now we do not have any reference to an abandoned terminal, so we can safely allow the thread
+        // to complete its task and destroy the terminal afterwards.
+        TerminalThread->Terminate();
 
         // When abandoning cancelled terminal, DoInformation(Phase = 0) does not make it to TerminalInformation handler.
         if (DebugAlwaysTrue(FAuthenticating > 0))