Merge remote-tracking branch 'upstream/master'

yiding-he · yiding-he · commit b78e21b0bb65 · 2020-02-26T17:52:50.000+08:00
diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
@@ -235,6 +235,7 @@ public void selectAction(String selectText) {
     @FXML
     private void exitAction(ActionEvent event) {
         Platform.exit();
+        System.exit(0);
     }
 
     @FXML

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ public void selectAction(String selectText) {`
`235`	`235`	`@FXML`
`236`	`236`	`private void exitAction(ActionEvent event) {`
`237`	`237`	`Platform.exit();`
	`238`	`+ System.exit(0);`
`238`	`239`	`}`
`239`	`240`
`240`	`241`	`@FXML`