added ExitModOrganizer(), used instead of qApp->exit()

reset geometry uses TaskDialog
moved restart code for the settings dialog to MainWindow
fixed settings sometimes not being saved when restarting
don't log "crash dumps present" every time the settings dialog is closed

1 files changed, 47 insertions, 0 deletions

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 07983e12..58f4eb2b 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -19,6 +19,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "util.h"

 #include "windows_error.h"

+#include "mainwindow.h"

 

 namespace MOShared

 {

@@ -244,3 +245,49 @@ MOBase::VersionInfo createVersionInfo()
 }

 

 } // namespace MOShared

+

+

+static bool g_exiting = false;

+

+MainWindow* findMainWindow()

+{

+  for (auto* tl : qApp->topLevelWidgets()) {

+    if (auto* mw=dynamic_cast<MainWindow*>(tl)) {

+      return mw;

+    }

+  }

+

+  return nullptr;

+}

+

+bool ExitModOrganizer(ExitFlags e)

+{

+  if (g_exiting) {

+    return true;

+  }

+

+  if (!e.testFlag(Exit::Force)) {

+    if (auto* mw=findMainWindow()) {

+      if (!mw->canExit()) {

+        return false;

+      }

+    }

+  }

+

+  g_exiting = true;

+

+  const int code = (e.testFlag(Exit::Restart) ? RestartExitCode : 0);

+  qApp->exit(code);

+

+  return true;

+}

+

+bool ModOrganizerExiting()

+{

+  return g_exiting;

+}

+

+void ResetExitFlag()

+{

+  g_exiting = false;

+}