feat: go on cancel folder priority over file in comparison

shunf4 · May 13, 2024 · 6b64d12 · 6b64d12
1 parent 91f7e0c
commit 6b64d12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CPP/7zip/UI/FileManager/BrowseDialog.cpp b/CPP/7zip/UI/FileManager/BrowseDialog.cpp
@@ -487,10 +487,10 @@ int CBrowseDialog::CompareItems(LPARAM lParam1, LPARAM lParam2)
   const CFileInfo &f1 = _files[(int)lParam1];
   const CFileInfo &f2 = _files[(int)lParam2];
 
-  bool isDir1 = f1.IsDir();
-  bool isDir2 = f2.IsDir();
-  if (isDir1 && !isDir2) return -1;
-  if (isDir2 && !isDir1) return 1;
+  // bool isDir1 = f1.IsDir();
+  // bool isDir2 = f2.IsDir();
+  // if (isDir1 && !isDir2) return -1;
+  // if (isDir2 && !isDir1) return 1;
 
   int res = 0;
   switch (_sortIndex)

diff --git a/CPP/7zip/UI/FileManager/PanelSort.cpp b/CPP/7zip/UI/FileManager/PanelSort.cpp
@@ -191,8 +191,8 @@ int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
 
   CPanel *panel = (CPanel*)lpData;
 
-  bool isDir1 = panel->IsItem_Folder((int)lParam1);
-  bool isDir2 = panel->IsItem_Folder((int)lParam2);
+  // bool isDir1 = panel->IsItem_Folder((int)lParam1);
+  // bool isDir2 = panel->IsItem_Folder((int)lParam2);
 
   // if (isDir1 && !isDir2) return -1;
   // if (isDir2 && !isDir1) return 1;