From 69b1bf5a268d1409098ca2082e98e571e5372ddb Mon Sep 17 00:00:00 2001 From: jellemdekker Date: Sat, 22 Dec 2018 12:53:42 +0100 Subject: [PATCH] Added a Cancel button to the graceful shutdown-dialog. Fixes issue #771. --- .../java/org/cryptomator/ui/controllers/MainController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java index 8a3153503..6814414f0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java @@ -222,7 +222,7 @@ public class MainController implements ViewController { ButtonType forceShutdownButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.forceShutdown")); Alert gracefulShutdownDialog = DialogBuilderUtil.buildGracefulShutdownDialog( localization.getString("main.gracefulShutdown.dialog.title"), localization.getString("main.gracefulShutdown.dialog.header"), localization.getString("main.gracefulShutdown.dialog.content"), - forceShutdownButtonType, forceShutdownButtonType, tryAgainButtonType); + forceShutdownButtonType, ButtonType.CANCEL, forceShutdownButtonType, tryAgainButtonType); Optional choice = gracefulShutdownDialog.showAndWait(); choice.ifPresent(btnType -> { @@ -230,6 +230,8 @@ public class MainController implements ViewController { gracefulShutdown(); } else if (forceShutdownButtonType.equals(btnType)) { Platform.runLater(Platform::exit); + } else { + return; } }); } else {