From c05d299fe4569df967688c0bd05f3f788bb39e6c Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 9 Oct 2013 04:45:44 +0000 Subject: [PATCH] Always prompt user before exiting or restarting Forge --- src/main/java/forge/control/FControl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java index 3337641a1c7..1d143d05fff 100644 --- a/src/main/java/forge/control/FControl.java +++ b/src/main/java/forge/control/FControl.java @@ -136,11 +136,12 @@ public enum FControl implements KeyEventDispatcher { } public boolean canExitForge(boolean forRestart) { + String userPrompt = "Are you sure you wish to " + (forRestart ? "restart" : "exit") + " Forge?"; if (this.game != null) { - String userPrompt = "A game is currently active. Are you sure you wish to " + (forRestart ? "restart" : "exit") + " Forge?\n\n"; - if (!MenuUtil.getUserConfirmation(userPrompt, "Exit Forge")) { - return false; - } + userPrompt = "A game is currently active. " + userPrompt; + } + if (!MenuUtil.getUserConfirmation(userPrompt, "Exit Forge")) { + return false; } if (!CDeckEditorUI.SINGLETON_INSTANCE.canExit()) { return false;