From 909e8254f7fe01121e32817337091c491abe2cf9 Mon Sep 17 00:00:00 2001
From: Al <gabriel.cortesi@outlook.com>
Date: Fri, 13 Dec 2019 13:36:12 +0100
Subject: Avoid opening folders in explorer when double-clicking on them in the
 filetree. As a side effect Enter and Return no longer do anything on folders
 either.

---
 src/modinfodialogfiletree.cpp |  5 +++++
 src/organizer_en.ts           | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index 2c33a7f1..cc0e6493 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -148,6 +148,11 @@ void FileTreeTab::onActivated()
     return;
   }
 
+  // Don't open explorer on directories as we just want them to be expanded instead.
+  if (m_fs->isDir(selection)) {
+    return;
+  }
+
   const auto path = m_fs->filePath(selection);
   const auto tryPreview = core().settings().interface().doubleClicksOpenPreviews();
 
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 593e4457..633073a0 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -1283,7 +1283,7 @@ Right now the only case I know of where this needs to be overwritten is for the
     </message>
     <message>
         <location filename="modinfodialogfiletree.cpp" line="27"/>
-        <location filename="modinfodialogfiletree.cpp" line="473"/>
+        <location filename="modinfodialogfiletree.cpp" line="478"/>
         <source>Open with &amp;VFS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1329,37 +1329,37 @@ Right now the only case I know of where this needs to be overwritten is for the
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="238"/>
+        <location filename="modinfodialogfiletree.cpp" line="243"/>
         <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="240"/>
+        <location filename="modinfodialogfiletree.cpp" line="245"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="243"/>
+        <location filename="modinfodialogfiletree.cpp" line="248"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="278"/>
+        <location filename="modinfodialogfiletree.cpp" line="283"/>
         <source>Failed to delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="469"/>
+        <location filename="modinfodialogfiletree.cpp" line="474"/>
         <source>&amp;Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="470"/>
+        <location filename="modinfodialogfiletree.cpp" line="475"/>
         <source>Execute with &amp;VFS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="472"/>
+        <location filename="modinfodialogfiletree.cpp" line="477"/>
         <source>&amp;Open</source>
         <translation type="unfinished"></translation>
     </message>
-- 
cgit v1.3.1