Factoring out HasActiveTerminal

(cherry picked from commit 87afd6b0352c1b4bb475e0d23a306f9ca0c0e70e)

Source commit: 8469d8039f54b99587a2445b43e7e2d6b361f4dd

source/forms/CustomScpExplorer.cpp

@@ -407,7 +407,7 @@ void __fastcall TCustomScpExplorerForm::RefreshPanel(const UnicodeString & Sessi
   }
 
   // We should flag a pending refresh for the background terminals or busy foreground terminals
-  if ((Terminal != NULL) && Terminal->Active &&
+  if (HasActiveTerminal() &&
       CanCommandLineFromAnotherInstance() &&
       (Session.IsEmpty() || Terminal->SessionData->IsSameSite(Data.get())) &&
       (Path.IsEmpty() || UnixIsChildPath(Path, Terminal->CurrentDirectory)))
@@ -480,8 +480,7 @@ void __fastcall TCustomScpExplorerForm::CreateHiddenWindow()
 bool __fastcall TCustomScpExplorerForm::CanConsole()
 {
   return
-    (Terminal != NULL) &&
-    Terminal->Active &&
+    HasActiveTerminal() &&
     (Terminal->IsCapable[fcAnyCommand] || Terminal->IsCapable[fcSecondaryShell]);
 }
 //---------------------------------------------------------------------------
@@ -977,7 +976,7 @@ void __fastcall TCustomScpExplorerForm::UpdateTransferList()
     TransferDropDown->Hint = FORMAT(L"%s|%s:\n%s",
       (FTransferDropDownHint, StripHotkey(Name),
        GUIConfiguration->CurrentCopyParam.GetInfoStr(L"; ",
-         FLAGMASK(((Terminal != NULL) && Terminal->Active), Terminal->UsableCopyParamAttrs(0).General))));
+         FLAGMASK(HasActiveTerminal(), Terminal->UsableCopyParamAttrs(0).General))));
     // update the label, otherwise when it is updated only on the first draw
     // of the list, it is drawn "bold" for some reason
     FTransferListHoverIndex = TransferList->ItemIndex;
@@ -1125,7 +1124,7 @@ bool __fastcall TCustomScpExplorerForm::CopyParamDialog(
   bool Confirm, bool DragDrop, int Options)
 {
   bool Result = true;
-  DebugAssert(Terminal && Terminal->Active);
+  DebugAssert(HasActiveTerminal());
 
   // these parameters are known in advance
   int Params =
@@ -1701,7 +1700,7 @@ bool __fastcall TCustomScpExplorerForm::DirViewEnabled(TOperationSide Side)
 {
   DebugAssert(GetSide(Side) == osRemote);
   DebugUsedParam(Side);
-  return (Terminal != NULL) && Terminal->Active;
+  return HasActiveTerminal();
 }
 //---------------------------------------------------------------------------
 bool __fastcall TCustomScpExplorerForm::GetEnableFocusedOperation(
@@ -1792,7 +1791,7 @@ bool __fastcall TCustomScpExplorerForm::CustomCommandRemoteAllowed()
 {
   // remote custom commands can be executed only if the server supports shell commands
   // or have secondary shell
-  return (FTerminal != NULL) && FTerminal->Active && (FTerminal->IsCapable[fcSecondaryShell] || FTerminal->IsCapable[fcShellAnyCommand]);
+  return HasActiveTerminal() && (FTerminal->IsCapable[fcSecondaryShell] || FTerminal->IsCapable[fcShellAnyCommand]);
 }
 //---------------------------------------------------------------------------
 int __fastcall TCustomScpExplorerForm::CustomCommandState(
@@ -3660,7 +3659,7 @@ void __fastcall TCustomScpExplorerForm::ExecutedFileChanged(const UnicodeString
   TEditedFileData * Data, HANDLE UploadCompleteEvent)
 {
   TTerminalManager * Manager = TTerminalManager::Instance();
-  if ((Data->Terminal == NULL) || !Data->Terminal->Active)
+  if (!IsActiveTerminal(Data->Terminal))
   {
     if (!NonVisualDataModule->Busy)
     {
@@ -3709,7 +3708,7 @@ void __fastcall TCustomScpExplorerForm::ExecutedFileChanged(const UnicodeString
       }
     }
 
-    if ((Data->Terminal == NULL) || !Data->Terminal->Active)
+    if (!IsActiveTerminal(Data->Terminal))
     {
       Configuration->Usage->Inc(L"EditInactiveSession");
       // Prevent this when not idle (!NonVisualDataModule->Busy)?
@@ -3761,7 +3760,7 @@ void __fastcall TCustomScpExplorerForm::ExecutedFileReload(
   // Sanity check, we should not be busy otherwise user would not be able to click Reload button.
   DebugAssert(!NonVisualDataModule->Busy);
 
-  if ((Data->Terminal == NULL) || !Data->Terminal->Active)
+  if (!IsActiveTerminal(Data->Terminal))
   {
     throw Exception(FMTLOAD(EDIT_SESSION_CLOSED_RELOAD,
       (ExtractFileName(FileName), Data->SessionName)));
@@ -4571,13 +4570,13 @@ void __fastcall TCustomScpExplorerForm::UpdateStatusBar()
 {
   TTBXStatusBar * SessionStatusBar = (TTBXStatusBar *)GetComponent(fcStatusBar);
   DebugAssert(SessionStatusBar != NULL);
-  if (!Terminal || !Terminal->Active || Terminal->Status < ssOpened)
+  if (!HasActiveTerminal() || (Terminal->Status < ssOpened))
   {
     // note: (Terminal->Status < sshReady) currently never happens here,
     // so STATUS_CONNECTING is never used
     SessionStatusBar->SimplePanel = true;
     SessionStatusBar->SimpleText = LoadStr(
-      !Terminal || !Terminal->Active ? STATUS_NOT_CONNECTED : STATUS_CONNECTING);
+      !HasActiveTerminal() ? STATUS_NOT_CONNECTED : STATUS_CONNECTING);
   }
   else
   {
@@ -6529,8 +6528,7 @@ bool __fastcall TCustomScpExplorerForm::CanAddEditLink(TOperationSide Side)
 {
   return
     (IsSideLocalBrowser(Side) ||
-     ((Terminal != NULL) &&
-      Terminal->Active &&
+     (HasActiveTerminal() &&
       Terminal->ResolvingSymlinks &&
       Terminal->IsCapable[fcSymbolicLink]));
 }
@@ -6872,7 +6870,7 @@ void __fastcall TCustomScpExplorerForm::UpdateTransferLabel()
       UnicodeString InfoStr =
         GUIConfiguration->CopyParamPreset[Name].
           GetInfoStr(L"; ",
-            FLAGMASK(((Terminal != NULL) && Terminal->Active), Terminal->UsableCopyParamAttrs(0).General));
+            FLAGMASK(HasActiveTerminal(), Terminal->UsableCopyParamAttrs(0).General));
       int MaxWidth = TransferList->MinWidth - (2 * TransferLabel->Margin) - ScaleByTextHeight(this, 10);
       if (Canvas->TextExtent(InfoStr).cx > MaxWidth)
       {
@@ -8648,7 +8646,7 @@ void __fastcall TCustomScpExplorerForm::UpdateControls()
     // ReconnectSessionAction is hidden when disabled, so enabling it actualy resizes the toolbar
     CenterReconnectToolbar();
 
-    bool HasTerminal = (Terminal != NULL) && Terminal->Active;
+    bool HasTerminal = HasActiveTerminal();
 
     if (HasTerminal)
     {
@@ -10196,7 +10194,7 @@ void __fastcall TCustomScpExplorerForm::SessionsPageControlContextPopup(TObject
 //---------------------------------------------------------------------------
 bool __fastcall TCustomScpExplorerForm::CanChangePassword()
 {
-  return (Terminal != NULL) && Terminal->Active && Terminal->IsCapable[fcChangePassword];
+  return HasActiveTerminal() && Terminal->IsCapable[fcChangePassword];
 }
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::ChangePassword()
@@ -10223,7 +10221,7 @@ void __fastcall TCustomScpExplorerForm::ChangePassword()
 bool __fastcall TCustomScpExplorerForm::CanPrivateKeyUpload()
 {
   // No nice way to assert SSH2
-  return (Terminal != NULL) && Terminal->Active && (Terminal->FSProtocol == cfsSFTP);
+  return HasActiveTerminal() && (Terminal->FSProtocol == cfsSFTP);
 }
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::PrivateKeyUpload()
@@ -10939,3 +10937,13 @@ void __fastcall TCustomScpExplorerForm::CloseApp()
     NonVisualDataModule->StartBusy();
   }
 }
+//---------------------------------------------------------------------------
+bool __fastcall TCustomScpExplorerForm::IsActiveTerminal(TTerminal * Terminal)
+{
+  return (Terminal != NULL) && Terminal->Active;
+}
+//---------------------------------------------------------------------------
+bool __fastcall TCustomScpExplorerForm::HasActiveTerminal()
+{
+  return IsActiveTerminal(Terminal);
+}

source/forms/CustomScpExplorer.h

@@ -709,6 +709,7 @@ protected:
   int __fastcall GetStaticQueuePanelComponentsHeight();
   int __fastcall GetMinQueueViewHeight();
   void __fastcall DetachTerminal(TObject * ATerminal);
+  bool __fastcall IsActiveTerminal(TTerminal * Terminal);
 
 public:
   virtual __fastcall ~TCustomScpExplorerForm();
@@ -738,6 +739,7 @@ public:
   void __fastcall UnlockWindow();
   void __fastcall SuspendWindowLock();
   void __fastcall ResumeWindowLock();
+  bool __fastcall HasActiveTerminal();
 
   void __fastcall NewSession(bool FromSite, const UnicodeString & SessionUrl = L"");
   void __fastcall DuplicateSession();

source/forms/NonVisual.cpp

@@ -134,7 +134,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
     return;
   }
   void * Param;
-  #define HasTerminal (ScpExplorer->Terminal != NULL) && ScpExplorer->Terminal->Active
+  #define HasTerminal ScpExplorer->HasActiveTerminal()
   // CURRENT DIRVIEW
   #define EnabledSelectedOperation (ScpExplorer->EnableSelectedOperation[osCurrent])
   #define EnabledFocusedOperation (ScpExplorer->EnableFocusedOperation[osCurrent])