Merged gluon-oss/scenebuilder into default

gluonhq · Nov 28, 2017 · cd4395d · cd4395d
2 parents da4368a + 7253268
commit cd4395d
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java
@@ -382,6 +382,8 @@ public void start(Stage stage) throws Exception {
      */
     @Override
     public void handleLaunch(List<String> files) {
+        boolean showWelcomeDialog = files.isEmpty();
+
         setApplicationUncaughtExceptionHandler();
 
         MavenPreferences mavenPreferences = PreferencesController.getSingleton().getMavenPreferences();
@@ -403,14 +405,19 @@ public void handleLaunch(List<String> files) {
                 }
             }
             if (shouldShowImportGluonJarAlert) {
-                SceneBuilderApp sceneBuilderApp = SceneBuilderApp.getSingleton();
-                DocumentWindowController dwc = sceneBuilderApp.getFrontDocumentWindow();
-                if (dwc == null) {
-                    dwc = sceneBuilderApp.getDocumentWindowControllers().get(0);
-                }
-                ImportingGluonControlsAlert alert = new ImportingGluonControlsAlert(dwc.getStage());
-                AppSettings.setWindowIcon(alert);
-                alert.showAndWait();
+                Platform.runLater(() -> {
+                    SceneBuilderApp sceneBuilderApp = SceneBuilderApp.getSingleton();
+                    DocumentWindowController dwc = sceneBuilderApp.getFrontDocumentWindow();
+                    if (dwc == null) {
+                        dwc = sceneBuilderApp.getDocumentWindowControllers().get(0);
+                    }
+                    ImportingGluonControlsAlert alert = new ImportingGluonControlsAlert(dwc.getStage());
+                    AppSettings.setWindowIcon(alert);
+                    if (showWelcomeDialog) {
+                        alert.initOwner(WelcomeDialogWindowController.getInstance().getStage());
+                    }
+                    alert.showAndWait();
+                });
             }
             updateImportedGluonJars(jarReports);
         });
@@ -421,7 +428,7 @@ public void handleLaunch(List<String> files) {
 
         sendTrackingStartupInfo();
 
-        if (files.isEmpty()) {
+        if (showWelcomeDialog) {
             // Creates an empty document
             final DocumentWindowController newWindow = makeNewWindow();
             newWindow.updateWithDefaultContent();