Merged in development.

2017-08-17 16:14:09 +12:00
parent 288979be3b
commit 9f813ab7aa
2 changed files with 11 additions and 6 deletions
@@ -116,7 +116,7 @@ public class App extends Application {
                boatTask,
                () -> {
                    try {
-                        showMainStage();
+                        showMainStage(new Stage());
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
@@ -146,8 +146,9 @@ public class App extends Application {
     * Show the main stage after the splash screen
     * @throws Exception
     */
-    private void showMainStage() throws Exception {
-        stage = new Stage(StageStyle.DECORATED);
+    public void showMainStage(Stage stage) throws Exception {
+        App.stage = stage;
+        App.app = this;
        FXMLLoader loader = new FXMLLoader(getClass().getResource("/visualiser/scenes/main.fxml"));
        Parent root = loader.load();
        stage.setResizable(false);