fix musescore#9966: added closing of the app window after closing the…

… current project if there are other instances of the app
RomanPudashkin · Dec 12, 2021 · 7736e49 · 7736e49
1 parent 4a1219b
commit 7736e49
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/project/internal/projectactionscontroller.cpp b/src/project/internal/projectactionscontroller.cpp
@@ -46,7 +46,11 @@ void ProjectActionsController::init()
 
     dispatcher()->reg(this, "file-open", this, &ProjectActionsController::openProject);
     dispatcher()->reg(this, "file-new", this, &ProjectActionsController::newProject);
-    dispatcher()->reg(this, "file-close", [this]() { closeOpenedProject(); });
+
+    dispatcher()->reg(this, "file-close", [this]() {
+        bool quitApp = multiInstancesProvider()->instances().size() > 1;
+        closeOpenedProject(quitApp);
+    });
 
     dispatcher()->reg(this, "file-save", [this]() { saveProject(); });
     dispatcher()->reg(this, "file-save-as", this, &ProjectActionsController::saveProjectAs);
@@ -260,7 +264,7 @@ void ProjectActionsController::newProject()
     }
 }
 
-bool ProjectActionsController::closeOpenedProject()
+bool ProjectActionsController::closeOpenedProject(bool quitApp)
 {
     INotationProjectPtr project = currentNotationProject();
     if (!project) {
@@ -287,6 +291,10 @@ bool ProjectActionsController::closeOpenedProject()
 
     if (result) {
         globalContext()->setCurrentProject(nullptr);
+
+        if (quitApp) {
+            dispatcher()->dispatch("quit", actions::ActionData::make_arg1<bool>(false));
+        }
     }
 
     return result;

diff --git a/src/project/internal/projectactionscontroller.h b/src/project/internal/projectactionscontroller.h
@@ -60,7 +60,7 @@ class ProjectActionsController : public IProjectFilesController, public QObject,
     void init();
 
     Ret openProject(const io::path& projectPath) override;
-    bool closeOpenedProject() override;
+    bool closeOpenedProject(bool quitApp = false) override;
     bool isProjectOpened(const io::path& scorePath) const override;
     bool isAnyProjectOpened() const override;
     bool saveProject(const io::path& path = io::path()) override;

diff --git a/src/project/iprojectfilescontroller.h b/src/project/iprojectfilescontroller.h
@@ -35,7 +35,7 @@ class IProjectFilesController : MODULE_EXPORT_INTERFACE
     virtual ~IProjectFilesController() = default;
 
     virtual Ret openProject(const io::path& path) = 0;
-    virtual bool closeOpenedProject() = 0;
+    virtual bool closeOpenedProject(bool quitApp = false) = 0;
     virtual bool isProjectOpened(const io::path& path) const = 0;
     virtual bool isAnyProjectOpened() const = 0;
     virtual bool saveProject(const io::path& path = io::path()) = 0;