don't sort builtin workspaces

musescore · Feb 21, 2025 · 8e99b61 · 8e99b61
1 parent 3b88113
commit 8e99b61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/framework/workspace/internal/workspacemanager.cpp b/src/framework/workspace/internal/workspacemanager.cpp
@@ -308,16 +308,15 @@ io::paths_t WorkspaceManager::findWorkspaceFiles() const
     };
 
     io::paths_t builtinWorkspacesPaths = configuration()->builtinWorkspacesFilePaths();
-
-    io::paths_t userWorkspacesPaths = findFiles(configuration()->userWorkspacesPath());
-    std::set<io::path_t> userWorkspacesFileNames;
-    for (const io::path_t& dirPath : userWorkspacesPaths) {
-        userWorkspacesFileNames.insert(io::filename(dirPath));
+    std::set<io::path_t> builtinWorkspacesFileNames;
+    for (const io::path_t& dirPath : builtinWorkspacesPaths) {
+        builtinWorkspacesFileNames.insert(io::filename(dirPath));
     }
 
-    muse::remove_if(builtinWorkspacesPaths, [=](const io::path_t& path) -> bool {
+    io::paths_t userWorkspacesPaths = findFiles(configuration()->userWorkspacesPath());
+    muse::remove_if(userWorkspacesPaths, [=](const io::path_t& path) -> bool {
         io::path_t fileName = io::filename(path);
-        return muse::contains(userWorkspacesFileNames, fileName);
+        return muse::contains(builtinWorkspacesFileNames, fileName);
     });
 
     io::paths_t result;

diff --git a/src/framework/workspace/internal/workspaceutils.cpp b/src/framework/workspace/internal/workspaceutils.cpp
@@ -31,5 +31,9 @@ bool WorkspaceUtils::workspaceLessThan(const IWorkspacePtr& workspace1, const IW
         return isWorkspace1Builtin;
     }
 
+    if (isWorkspace1Builtin && isWorkspace2Builtin) {
+        return false;
+    }
+
     return workspace1->name() < workspace2->name();
 }