fixed close application

Author: igorkorsukov

src/appshell/internal/applicationactioncontroller.cpp

@@ -218,7 +218,7 @@ bool ApplicationActionController::quit(bool isAllInstances, const muse::io::path
         m_quiting = false;
     };
 
-    if (!projectFilesController()->closeOpenedProject()) {
+    if (!projectFilesController()->closeOpenedProject(false)) {
         return false;
     }
 
@@ -244,7 +244,7 @@ bool ApplicationActionController::quit(bool isAllInstances, const muse::io::path
 
 void ApplicationActionController::restart()
 {
-    if (projectFilesController()->closeOpenedProject()) {
+    if (projectFilesController()->closeOpenedProject(false)) {
         if (multiInstancesProvider()->instances().size() == 1) {
             application()->restart();
         } else {

src/project/internal/projectactionscontroller.cpp

@@ -68,8 +68,12 @@ void ProjectActionsController::init()
 
     dispatcher()->reg(this, "file-close", [this]() {
         auto anyInstanceWithoutProject = multiInstancesProvider()->isHasAppInstanceWithoutProject();
-        closeOpenedProject(anyInstanceWithoutProject);
-        if (anyInstanceWithoutProject) {
+        bool ok = closeOpenedProject();
+        if (ok && anyInstanceWithoutProject) {
+            //! NOTE: we need to call `quit` in the next event loop due to controlling the lifecycle of this method
+            async::Async::call(this, [this]() {
+                dispatcher()->dispatch("quit", ActionData::make_arg1<bool>(false));
+            });
             multiInstancesProvider()->activateWindowWithoutProject();
         }
     });
@@ -603,11 +607,10 @@ muse::async::Notification ProjectActionsController::projectBeingDownloadedChange
 
 Ret ProjectActionsController::openPageIfNeed(Uri pageUri)
 {
-    if (interactive()->isOpened(pageUri).val) {
-        return make_ret(Ret::Code::Ok);
+    if (!interactive()->isOpened(pageUri).val) {
+        interactive()->open(pageUri);
     }
-
-    return interactive()->openSync(pageUri).ret;
+    return make_ret(Ret::Code::Ok);
 }
 
 bool ProjectActionsController::isProjectOpened(const muse::io::path_t& scorePath) const
@@ -674,7 +677,7 @@ void ProjectActionsController::newProject()
     });
 }
 
-bool ProjectActionsController::closeOpenedProject(bool quitApp)
+bool ProjectActionsController::closeOpenedProject(bool goToHome)
 {
     if (m_isProjectClosing) {
         return false;
@@ -712,12 +715,7 @@ bool ProjectActionsController::closeOpenedProject(bool quitApp)
         interactive()->closeAllDialogs();
         globalContext()->setCurrentProject(nullptr);
 
-        if (quitApp) {
-            //! NOTE: we need to call `quit` in the next event loop due to controlling the lifecycle of this method
-            async::Async::call(this, [this]() {
-                dispatcher()->dispatch("quit", ActionData::make_arg1<bool>(false));
-            });
-        } else {
+        if (goToHome) {
             Ret ret = openPageIfNeed(HOME_PAGE_URI);
             if (!ret) {
                 LOGE() << ret.toString();

src/project/internal/projectactionscontroller.h

@@ -92,7 +92,7 @@ class ProjectActionsController : public IProjectFilesController, public muse::mi
     bool isUrlSupported(const QUrl& url) const override;
     bool isFileSupported(const muse::io::path_t& path) const override;
     muse::Ret openProject(const ProjectFile& file) override;
-    bool closeOpenedProject(bool quitApp = false) override;
+    bool closeOpenedProject(bool goToHome = true) override;
     bool saveProject(const muse::io::path_t& path = muse::io::path_t()) override;
     bool saveProjectLocally(
         const muse::io::path_t& path = muse::io::path_t(), SaveMode saveMode = SaveMode::Save, bool createBackup = true) override;

src/project/iprojectfilescontroller.h

@@ -41,7 +41,7 @@ class IProjectFilesController : MODULE_EXPORT_INTERFACE
     virtual bool isUrlSupported(const QUrl& url) const = 0;
     virtual bool isFileSupported(const muse::io::path_t& path) const = 0;
     virtual muse::Ret openProject(const ProjectFile& file) = 0;
-    virtual bool closeOpenedProject(bool quitApp = false) = 0;
+    virtual bool closeOpenedProject(bool goToHome = true) = 0;
     virtual bool saveProject(const muse::io::path_t& path = muse::io::path_t()) = 0;
     virtual bool saveProjectLocally(
         const muse::io::path_t& path = muse::io::path_t(), SaveMode saveMode = SaveMode::Save, bool createBackup = true) = 0;