Fix save dialog not appearing when closing an edited project (#689)

* Fix save dialog not appearing when closing an edited project Closes #660 Closes #688
WPIRoboticsProjects · Dec 31, 2016 · 9693260 · 9693260
1 parent f8a9044
commit 9693260
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/ui/src/main/java/edu/wpi/grip/ui/Main.java b/ui/src/main/java/edu/wpi/grip/ui/Main.java
@@ -127,8 +127,6 @@ public void start(Stage stage) throws IOException {
         }
       });
 
-      // If this isn't here this can cause a deadlock on windows. See issue #297
-      stage.setOnCloseRequest(event -> SafeShutdown.exit(0, Platform::exit));
       stage.setTitle(MAIN_TITLE);
       stage.getIcons().add(new Image("/edu/wpi/grip/ui/icons/grip.png"));
       stage.setScene(new Scene(root));

diff --git a/ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java b/ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java
@@ -120,6 +120,12 @@ protected void initialize() {
       statusLabel.setText("Pipeline " + stateMessage);
       analyzeMenuItem.setDisable(state.equals(Service.State.TERMINATED));
     }), Platform::runLater);
+    Platform.runLater(() -> root.getScene().getWindow().setOnCloseRequest(e -> {
+      if (!quit()) {
+        // Asked to quit but cancelled, consume the event to avoid closing the window
+        e.consume();
+      }
+    }));
   }
 
   /**
@@ -278,11 +284,13 @@ protected void showProjectAboutDialog() throws IOException {
   }
 
   @FXML
-  protected void quit() {
+  protected boolean quit() {
     if (showConfirmationDialogAndWait()) {
       pipelineRunner.stopAsync();
       SafeShutdown.exit(0);
+      return true;
     }
+    return false;
   }
 
   /**

diff --git a/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml b/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml
@@ -98,11 +98,7 @@
                     </graphic>
                 </MenuItem>
                 <SeparatorMenuItem />
-                <MenuItem text="Exit" onAction="#quit">
-                    <accelerator>
-                        <KeyCodeCombination alt="UP" code="Q" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
-                    </accelerator>
-                </MenuItem>
+                <MenuItem text="Exit" onAction="#quit" />
             </Menu>
             <Menu text="Tools">
                 <MenuItem text="Deploy" onAction="#deploy">