Bug 1684: Failure when canceling session reconnect (6th)

https://winscp.net/tracker/1684

Source commit: 6b94f70d49ff39f5faaccc1fd51587f6eb4bdbf8

source/core/Terminal.cpp

@@ -1919,14 +1919,20 @@ void __fastcall TTerminal::SaveCapabilities(TFileSystemInfo & FileSystemInfo)
 //---------------------------------------------------------------------------
 bool __fastcall TTerminal::GetIsCapable(TFSCapability Capability) const
 {
-  DebugAssert(FFileSystem);
-  switch (Capability)
+  if (DebugAlwaysTrue(FFileSystem != NULL))
   {
-    case fsBackgroundTransfers:
-      return !IsEncryptingFiles();
+    switch (Capability)
+    {
+      case fsBackgroundTransfers:
+        return !IsEncryptingFiles();
 
-    default:
-      return FFileSystem->IsCapable(Capability);
+      default:
+        return FFileSystem->IsCapable(Capability);
+    }
+  }
+  else
+  {
+    return false;
   }
 }
 //---------------------------------------------------------------------------

source/forms/CustomScpExplorer.cpp

@@ -486,7 +486,10 @@ void __fastcall TCustomScpExplorerForm::CreateHiddenWindow()
 //---------------------------------------------------------------------------
 bool __fastcall TCustomScpExplorerForm::CanConsole()
 {
-  return (Terminal != NULL) && (Terminal->IsCapable[fcAnyCommand] || Terminal->IsCapable[fcSecondaryShell]);
+  return
+    (Terminal != NULL) &&
+    Terminal->Active &&
+    (Terminal->IsCapable[fcAnyCommand] || Terminal->IsCapable[fcSecondaryShell]);
 }
 //---------------------------------------------------------------------------
 bool __fastcall TCustomScpExplorerForm::CanCommandLineFromAnotherInstance()