fix crash on changing workspaces when installing/removing extensions

musescore · Sep 30, 2019 · 4e75169 · RobFog · Sep 30, 2019 · 4e75169
1 parent 3c2cb77
commit 4e75169
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -825,7 +825,7 @@ bool MuseScore::importExtension(QString path)
             if (!wsList.isEmpty()) {
                   Workspace::refreshWorkspaces();
                   emit workspacesChanged();
-                  paletteBox->selectWorkspace(wsList.last().absoluteFilePath());
+                  changeWorkspace(Workspace::workspaces().last());
                   }
             }
       return true;
@@ -889,9 +889,22 @@ bool MuseScore::uninstallExtension(QString extensionId)
       mscore->reloadInstrumentTemplates();
       mscore->updateInstrumentDialog();
       if (refreshWorkspaces) {
+            const auto& curWorkspaceName = Workspace::currentWorkspace->name();
             Workspace::refreshWorkspaces();
             emit workspacesChanged();
-            paletteBox->selectWorkspace(-1);
+            auto workspaces = Workspace::workspaces();
+            //If current worksapce is alive, do nothing
+            //Select first available workspace in the list otherwise
+            bool curWorkspaceDisappeared = true;
+            for (auto workspace : workspaces) {
+                  if (workspace->name() == curWorkspaceName) {
+                        curWorkspaceDisappeared = false;
+                        break;
+                        }
+                  }
+            if (curWorkspaceDisappeared)
+                  changeWorkspace(Workspace::workspaces().last());
+            //paletteBox->selectWorkspace(-1);
             }
       return true;
       }