ref #544 dir sort elements for all platforms

nelson-lang · Dec 29, 2021 · f878848 · f878848
1 parent 45a7af4
commit f878848
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/modules/files_folders_functions/src/cpp/ListFiles.cpp b/modules/files_folders_functions/src/cpp/ListFiles.cpp
@@ -198,22 +198,22 @@ ListFiles(const std::wstring& directory, bool bSubdirectories)
             bool
             operator()(FileInfo a, FileInfo b) // lgtm [cpp/large-parameter]
             {
-                return a.getName() < b.getName();
+                return static_cast<int>(a.isDir()) > static_cast<int>(b.isDir());
             }
-        } customFilenameLess;
+        } customIsDirLess;
         if (!res.empty()) {
-            std::sort(res.begin(), res.end(), customFilenameLess);
+            std::sort(res.begin(), res.end(), customIsDirLess);
         }
         struct
         {
             bool
             operator()(FileInfo a, FileInfo b) // lgtm [cpp/large-parameter]
             {
-                return static_cast<int>(a.isDir()) > static_cast<int>(b.isDir());
+                return a.getName() < b.getName();
             }
-        } customIsDirLess;
+        } customFilenameLess;
         if (!res.empty()) {
-            std::sort(res.begin(), res.end(), customIsDirLess);
+            std::sort(res.begin(), res.end(), customFilenameLess);
         }
     }
     return res;