Couple fixes to game state save/restore logic.

This commit is contained in:
Myrd
2014-12-18 17:50:43 +00:00
parent 8c97af50de
commit e9be6c9152

View File

@@ -1445,7 +1445,11 @@ public class PlayerControllerHuman extends PlayerController {
bw.close(); bw.close();
} }
} catch (Exception e) { } catch (Exception e) {
SOptionPane.showErrorDialog(e.getMessage()); String err = e.getClass().getName();
if (e.getMessage() != null) {
err += ": " + e.getMessage();
}
SOptionPane.showErrorDialog(err);
e.printStackTrace(); e.printStackTrace();
} }
} }
@@ -1478,6 +1482,7 @@ public class PlayerControllerHuman extends PlayerController {
Player pPriority = game.getPhaseHandler().getPriorityPlayer(); Player pPriority = game.getPhaseHandler().getPriorityPlayer();
if (pPriority == null) { if (pPriority == null) {
SGuiDialog.message("No player has priority at the moment, so game state cannot be setup."); SGuiDialog.message("No player has priority at the moment, so game state cannot be setup.");
return;
} }
state.applyToGame(game); state.applyToGame(game);
} }