Browse Source

Bug 1611: Failure when focused panel is changed, while double-clicking a file to edit it

https://winscp.net/tracker/1611

Source commit: 11e0a0c5179b001b054eca78c9afc758e1cdd915
Martin Prikryl 7 years ago
parent
commit
e538755899
1 changed files with 4 additions and 4 deletions
  1. 4 4
      source/forms/CustomScpExplorer.cpp

+ 4 - 4
source/forms/CustomScpExplorer.cpp

@@ -4860,6 +4860,7 @@ void __fastcall TCustomScpExplorerForm::DoDirViewExecFile(TObject * Sender,
   TCustomDirView * ADirView = (TCustomDirView *)Sender;
   bool Remote = (ADirView == DirView(osRemote));
   bool ResolvedSymlinks = !Remote || Terminal->ResolvingSymlinks;
+  TOperationSide Side = (Remote ? osRemote : osLocal);
 
   // Anything special is done on double click only (not on "open" indicated by FForceExecution),
   // on files only (not directories)
@@ -4877,9 +4878,8 @@ void __fastcall TCustomScpExplorerForm::DoDirViewExecFile(TObject * Sender,
         UnlockWindow();
         try
         {
-          ExecuteFileOperation(foCopy,
-            (ADirView == DirView(osRemote) ? osRemote : osLocal),
-            true, !WinConfiguration->CopyOnDoubleClickConfirmation);
+          ExecuteFileOperation(
+            foCopy, Side, true, !WinConfiguration->CopyOnDoubleClickConfirmation);
         }
         __finally
         {
@@ -4891,7 +4891,7 @@ void __fastcall TCustomScpExplorerForm::DoDirViewExecFile(TObject * Sender,
       {
         if (!Remote || !WinConfiguration->DisableOpenEdit)
         {
-          ExecuteFile(osCurrent, efDefaultEditor);
+          ExecuteFile(Side, efDefaultEditor);
           AllowExec = false;
         }
       }