When resolving symlinks is disabled because of file encryption, double click should still treat files as files, not as folders

Source commit: 350c57bf74f2529b5159263d8e56e375a6f26394

source/components/UnixDirView.cpp

@@ -88,7 +88,7 @@ void __fastcall TUnixDirView::ExecuteFile(TListItem * Item)
 #ifndef DESIGN_ONLY
   ASSERT_VALID_ITEM;
   if (ITEMFILE->IsDirectory ||
-      !Terminal->ResolvingSymlinks)
+      (!Terminal->ResolvingSymlinks && !Terminal->IsEncryptingFiles()))
   {
     PathChanging(true);
     ChangeDirectory(ITEMFILE->FileName);

source/forms/CustomScpExplorer.cpp

@@ -2340,7 +2340,7 @@ void __fastcall TCustomScpExplorerForm::DirViewContextPopupDefaultItem(
       (WinConfiguration->DoubleClickAction == DoubleClickAction) &&
       // when resolving links is disabled, default action is to enter the directory,
       // no matter what DoubleClickAction is configured to
-      ((Side != osRemote) || Terminal->ResolvingSymlinks) &&
+      ((Side != osRemote) || Terminal->ResolvingSymlinks || Terminal->IsEncryptingFiles()) &&
       // Can only Edit files, but can Open/Copy even directories
       ((DoubleClickAction != dcaEdit) ||
        !DView->ItemIsDirectory(DView->ItemFocused)))
@@ -4985,11 +4985,11 @@ void __fastcall TCustomScpExplorerForm::DoDirViewExecFile(TObject * Sender,
   // on files only (not directories)
   // and only when symlinks are resolved (apply to remote panel only)
   if (!ADirView->ItemIsDirectory(Item) &&
-      (ResolvedSymlinks || FForceExecution))
+      (ResolvedSymlinks || FForceExecution || Terminal->IsEncryptingFiles()))
   {
     if ((WinConfiguration->DoubleClickAction != dcaOpen) &&
         !FForceExecution &&
-        ResolvedSymlinks)
+        (ResolvedSymlinks || Terminal->IsEncryptingFiles()))
     {
       if (WinConfiguration->DoubleClickAction == dcaCopy)
       {