Merge pull request #661 from AustinShalit/fix/projectSaveNull

AustinShalit · web-flow · commit 1e5fcd46ffaf · 2016-08-09T18:05:03.000-07:00
A null file will cancel application exit
diff --git a/ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java b/ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java
@@ -122,7 +122,7 @@ private boolean showConfirmationDialogAndWait() {
         // If the user chose "Save", automatically show a save dialog and block until the user
         // has had a chance to save the project.
         try {
-          saveProject();
+          return saveProject();
         } catch (IOException e) {
           logger.log(Level.SEVERE, e.getMessage(), e.getCause());
         }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private boolean showConfirmationDialogAndWait() {`
`122`	`122`	`// If the user chose "Save", automatically show a save dialog and block until the user`
`123`	`123`	`// has had a chance to save the project.`
`124`	`124`	`try {`
`125`		`- saveProject();`
	`125`	`+ return saveProject();`
`126`	`126`	`} catch (IOException e) {`
`127`	`127`	`logger.log(Level.SEVERE, e.getMessage(), e.getCause());`
`128`	`128`	`}`