Преглед изворни кода

More understandable implementation

(cherry picked from commit 3bd6f94b51a93c714063ddac195d7fe4d646f04c)

Source commit: ff03e38ddff6a49467a570da00f04d036806d8d6
Martin Prikryl пре 5 година
родитељ
комит
87aac8a8ca
1 измењених фајлова са 3 додато и 4 уклоњено
  1. 3 4
      source/forms/CustomScpExplorer.cpp

+ 3 - 4
source/forms/CustomScpExplorer.cpp

@@ -5281,18 +5281,17 @@ void __fastcall TCustomScpExplorerForm::DoDirViewExecFile(TObject * Sender,
   DebugAssert(AllowExec);
   TCustomDirView * ADirView = (TCustomDirView *)Sender;
   bool Remote = (ADirView == DirView(osRemote)) && !IsSideLocalBrowser(osRemote);
-  bool ResolvedSymlinks = !Remote || Terminal->ResolvingSymlinks;
+  bool ResolvedSymlinks = !Remote || Terminal->ResolvingSymlinks || Terminal->IsEncryptingFiles();
   TOperationSide Side = (Remote ? osRemote : osLocal); // TODO
 
   // Anything special is done on double click only (not on "open" indicated by FForceExecution),
   // on files only (not directories)
   // and only when symlinks are resolved (apply to remote panel only)
   if (!ADirView->ItemIsDirectory(Item) &&
-      (ResolvedSymlinks || FForceExecution || Terminal->IsEncryptingFiles()))
+      (ResolvedSymlinks || FForceExecution))
   {
     if ((WinConfiguration->DoubleClickAction != dcaOpen) &&
-        !FForceExecution &&
-        (ResolvedSymlinks || Terminal->IsEncryptingFiles()))
+        !FForceExecution && ResolvedSymlinks)
     {
       if (WinConfiguration->DoubleClickAction == dcaCopy)
       {