diff --git a/forge-gui/src/main/java/forge/limited/GauntletMini.java b/forge-gui/src/main/java/forge/limited/GauntletMini.java index 8e7f6daea8e..28d19a0b649 100644 --- a/forge-gui/src/main/java/forge/limited/GauntletMini.java +++ b/forge-gui/src/main/java/forge/limited/GauntletMini.java @@ -134,6 +134,7 @@ public class GauntletMini { } resetCurrentRound(); + startRound(); } /** diff --git a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java index 62a70219da0..9f5ee1780f6 100644 --- a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java +++ b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java @@ -79,12 +79,17 @@ public final class GamePlayerUtil { String oldPlayerName = FModel.getPreferences().getPref(FPref.PLAYER_NAME); String newPlayerName; - if (StringUtils.isBlank(oldPlayerName)) { - newPlayerName = getVerifiedPlayerName(getPlayerNameUsingFirstTimePrompt(), oldPlayerName); - } - else { - newPlayerName = getVerifiedPlayerName(getPlayerNameUsingStandardPrompt(oldPlayerName), oldPlayerName); - } + try{ + if (StringUtils.isBlank(oldPlayerName)) { + newPlayerName = getVerifiedPlayerName(getPlayerNameUsingFirstTimePrompt(), oldPlayerName); + } + else { + newPlayerName = getVerifiedPlayerName(getPlayerNameUsingStandardPrompt(oldPlayerName), oldPlayerName); + } + } catch (IllegalStateException ise){ + //now is not a good time for this... + newPlayerName = StringUtils.isBlank(oldPlayerName) ? "Human" : oldPlayerName; + } FModel.getPreferences().setPref(FPref.PLAYER_NAME, newPlayerName); FModel.getPreferences().save();