Fix application freezing after ⌘-Q when in background

Author: airsquared

src/main/java/com/airsquared/blobsaver/Background.java

@@ -105,12 +105,7 @@ static void startBackground(boolean runOnlyOnce) {
             openItem.setFont(Font.decode(null).deriveFont(Font.BOLD)); // bold it
 
             MenuItem exitItem = new MenuItem("Quit");
-            exitItem.addActionListener(event -> {
-                executor.shutdownNow();
-                Platform.runLater(Platform::exit);
-                tray.remove(trayIcon);
-                System.exit(0);
-            });
+            exitItem.addActionListener(event -> Platform.runLater(Platform::exit));
 
             // setup the popup menu for the application.
             final PopupMenu popup = new PopupMenu();
@@ -321,14 +316,13 @@ private static void showStage() {
     static void stopBackground(boolean showAlert) {
         inBackground = false;
         executor.shutdownNow();
-        SwingUtilities.invokeLater(() -> SystemTray.getSystemTray().remove(trayIcon));
-        if (showAlert && Platform.isFxApplicationThread()) {
-            Alert alert = new Alert(Alert.AlertType.INFORMATION,
-                    "The background process has been cancelled",
-                    ButtonType.OK);
-            alert.showAndWait();
-        } else if (showAlert) {
-            Platform.runLater(() -> {
+        if (SwingUtilities.isEventDispatchThread()) {
+            SystemTray.getSystemTray().remove(trayIcon);
+        } else {
+            SwingUtilities.invokeLater(() -> SystemTray.getSystemTray().remove(trayIcon));
+        }
+        if (showAlert) {
+            Shared.runSafe(() -> {
                 Alert alert = new Alert(Alert.AlertType.INFORMATION,
                         "The background process has been cancelled",
                         ButtonType.OK);

src/main/java/com/airsquared/blobsaver/Controller.java

@@ -750,8 +750,6 @@ public void startBackgroundHandler() {
                 appPrefs.putBoolean("Show background startup message", true);
                 appPrefs.putBoolean("Start background immediately", false);
                 Platform.exit();
-                Background.stopBackground(false);
-                System.exit(0);
             } else {
                 Background.stopBackground(true);
                 appPrefs.putBoolean("Show background startup message", true);
@@ -766,7 +764,6 @@ public void startBackgroundHandler() {
             appPrefs.putBoolean("Show background startup message", false);
             appPrefs.putBoolean("Start background immediately", true);
             Platform.exit();
-            System.exit(0);
         } else if (appPrefs.getBoolean("Show background startup message", true)) {
             Alert alert = new Alert(Alert.AlertType.INFORMATION,
                     "The application will now enter the background. By default, when you launch this application, it will start up in the background. "
@@ -809,7 +806,6 @@ public void resetAppHandler() {
             Alert applicationCloseAlert = new Alert(Alert.AlertType.INFORMATION, "The application data and files have been removed. If you are running Windows, you still will need to run the uninstall .exe. Otherwise, you can just delete the .app or .jar file.\nThe application will now exit.", ButtonType.OK);
             applicationCloseAlert.showAndWait();
             Platform.exit();
-            System.exit(0);
         } catch (BackingStoreException e) {
             newReportableError("There was an error resetting the application.", e.getMessage());
         }

src/main/java/com/airsquared/blobsaver/Main.java

@@ -99,11 +99,17 @@ public void start(Stage primaryStage) throws IOException {
                 if (Background.inBackground) {
                     primaryStage.hide();
                 } else {
-                    Platform.exit();
-                    System.exit(0);
+                    stop();
                 }
             });
             appPrefs.put("App version", appVersion);
         }
+
+        @Override
+        public void stop() {
+            if (Background.inBackground) {
+                Background.stopBackground(false);
+            }
+        }
     }
 }