Bug 1881: Failure after using files from a disconnected session (for example saving an edited file)

https://winscp.net/tracker/1881
(cherry picked from commit 01c9c5f5838e890cf94f189531ad2a527be5093f)

# Conflicts:
#	source/forms/CustomScpExplorer.h

Source commit: e59a2e7039c87f05d1686bec622a6145b23af9ea

source/forms/CustomScpExplorer.cpp

@@ -4851,6 +4851,7 @@ void __fastcall TCustomScpExplorerForm::DisconnectSession()
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::TerminalDisconnected()
 {
+  DetachTerminal(Terminal);
   RemoteDirView->Terminal = Terminal;
   UpdateRemotePathComboBox(false);
   UpdateControls();
@@ -6544,22 +6545,27 @@ void __fastcall TCustomScpExplorerForm::ExecuteCurrentFileWith(bool OnFocused)
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::TerminalRemoved(TObject * Sender)
+void __fastcall TCustomScpExplorerForm::DetachTerminal(TObject * ATerminal)
 {
-  FEditorManager->ProcessFiles(FileTerminalRemoved, Sender);
+  FEditorManager->ProcessFiles(FileTerminalRemoved, ATerminal);
 
-  if (FFileFindTerminal == Sender)
+  if (FFileFindTerminal == ATerminal)
   {
     FFileFindTerminal = NULL;
     HideFileFindDialog();
   }
 
-  if (FClipboardTerminal == Sender)
+  if (FClipboardTerminal == ATerminal)
   {
     ClipboardClear(); // implies ClipboardStop
   }
 }
 //---------------------------------------------------------------------------
+void __fastcall TCustomScpExplorerForm::TerminalRemoved(TObject * Sender)
+{
+  DetachTerminal(Sender);
+}
+//---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::FileTerminalRemoved(const UnicodeString FileName,
   TEditedFileData * Data, TObject * /*Token*/, void * Arg)
 {

source/forms/CustomScpExplorer.h

@@ -690,6 +690,7 @@ protected:
   void __fastcall CenterReconnectToolbar();
   void __fastcall DoOpenFolderOrWorkspace(const UnicodeString & Name, bool ConnectFirstTerminal);
   virtual void __fastcall ThemeChanged();
+  void __fastcall DetachTerminal(TObject * ATerminal);
 
 public:
   virtual __fastcall ~TCustomScpExplorerForm();