From f3c5cebb6e9262625105d4339a54a810d7816811 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 15 Dec 2019 21:56:50 -0500
Subject: fixed exiting before QThread joins when pressing the X twice

---
 src/mainwindow.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a29ea8ab..d1578d85 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1317,18 +1317,25 @@ void MainWindow::closeEvent(QCloseEvent* event)
   //
   // for 2), the settings have been saved and the window can just close
 
-  if (ModOrganizerExiting()) {
+  if (ModOrganizerCanCloseNow()) {
     // the user has confirmed if necessary and all settings have been saved,
     // just close it
     QMainWindow::closeEvent(event);
-  } else {
-    // never close the window because settings might need to be changed
-    event->ignore();
+    return;
+  }
 
-    // start the process of exiting, which may require confirmation by calling
-    // canExit(), among other things
-    ExitModOrganizer();
+  if (ModOrganizerExiting()) {
+    // ignore repeated attempts
+    event->ignore();
+    return;
   }
+
+  // never close the window because settings might need to be changed
+  event->ignore();
+
+  // start the process of exiting, which may require confirmation by calling
+  // canExit(), among other things
+  ExitModOrganizer();
 }
 
 bool MainWindow::canExit()
-- 
cgit v1.3.1