Fix primaryStage not opening while in background

Author: airsquared

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

@@ -24,7 +24,6 @@
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.effect.DropShadow;
@@ -34,7 +33,6 @@
 import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
 import org.json.JSONArray;
 
 import java.awt.Desktop;
@@ -113,6 +111,9 @@ static void afterStageShowing() {
                 btn.setText("Load " + appPrefs.get("Name Preset" + i, ""));
             }
         }
+        if (PlatformUtil.isMac()) {
+            INSTANCE.useMacOSMenuBar();
+        }
         checkForUpdates(false);
     }
 
@@ -187,18 +188,6 @@ public void initialize() {
             path = path + System.getProperty("file.separator") + "Blobs";
         }
         pathField.setText(path);
-
-        // use macos menu bar or not
-        if (PlatformUtil.isMac()) {
-            primaryStage.setOnShowing(new EventHandler<WindowEvent>() {
-                @Override
-                public void handle(WindowEvent event) {
-                    useMacOSMenuBar();
-                    log("using macOS menu bar");
-                    primaryStage.removeEventHandler(event.getEventType(), this);
-                }
-            });
-        }
     }
 
     private static void addListenerToSetNullEffect(TextField... textFields) {
@@ -663,6 +652,7 @@ private void useMacOSMenuBar() {
 
         // needs to be run with Platform.runLater(), otherwise the application menu doesn't show up
         Platform.runLater(() -> tk.setGlobalMenuBar(macOSMenuBar));
+        log("using macOS menu bar");
     }
 
     public void backgroundSettingsHandler() {

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

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