Moving local variables close to use with shorter life span

Source commit: 5ef01ef94c1cef2c5a26352dc9a80ccdc4a01974

source/forms/CustomScpExplorer.cpp

@@ -1674,19 +1674,20 @@ void __fastcall TCustomScpExplorerForm::CustomCommand(TStrings * FileList,
 {
 
   TCustomCommandData Data(Terminal);
-  std::unique_ptr<TCustomCommand> CustomCommandForOptions;
-  if (FLAGCLEAR(ACommand.Params, ccLocal))
-  {
-    CustomCommandForOptions.reset(new TRemoteCustomCommand(Data, Terminal->CurrentDirectory));
-  }
-  else
-  {
-    CustomCommandForOptions.reset(new TLocalCustomCommand(Data, Terminal->CurrentDirectory, DefaultDownloadTargetDirectory()));
-  }
 
   std::unique_ptr<TStrings> CustomCommandOptions(CloneStrings(WinConfiguration->CustomCommandOptions));
   if (ACommand.AnyOptionWithFlag(TCustomCommandType::ofRun))
   {
+    std::unique_ptr<TCustomCommand> CustomCommandForOptions;
+    if (FLAGCLEAR(ACommand.Params, ccLocal))
+    {
+      CustomCommandForOptions.reset(new TRemoteCustomCommand(Data, Terminal->CurrentDirectory));
+    }
+    else
+    {
+      CustomCommandForOptions.reset(new TLocalCustomCommand(Data, Terminal->CurrentDirectory, DefaultDownloadTargetDirectory()));
+    }
+
     if (!DoCustomCommandOptionsDialog(&ACommand, CustomCommandOptions.get(), TCustomCommandType::ofRun, CustomCommandForOptions.get()))
     {
       Abort();