diff --git a/settings2.dat b/settings2.dat index 131979d294d0adc57b10ac0fb8627e0b547e2ad2..f3f84bafa0f4e45428da95d31d7f559fca04ee25 100644 Binary files a/settings2.dat and b/settings2.dat differ diff --git a/src/GUI/settings/Controller.java b/src/GUI/settings/Controller.java index b395f244ae960b677bf3b51cdb88f376c5de0896..b452fbd3667bb0499731283a1625b9fed4e21a4e 100644 --- a/src/GUI/settings/Controller.java +++ b/src/GUI/settings/Controller.java @@ -23,6 +23,7 @@ public class Controller { this.settings = settings; this.progSettings = progsettings; + } void setModel(Model settingsModel) diff --git a/src/GUI/settings/Model.java b/src/GUI/settings/Model.java index a47e26c74b0d0cd6f754caad6124d9cba3b86097..6d069e1132d0904a6d47a3195a3a5bedaeb1f5fb 100644 --- a/src/GUI/settings/Model.java +++ b/src/GUI/settings/Model.java @@ -69,7 +69,15 @@ public class Model void setPlayerName(String text) { // this.tempSettings.playerName=text; - this.tempSettings.actualPlayer.name = text; + //this.tempSettings.actualPlayer.name = text; + Player player = new Player(); + player.date = this.tempSettings.actualPlayer.date; + player.maxScore = this.tempSettings.actualPlayer.maxScore; + player.name = text; + + this.tempSettings.actualPlayer = player; + + //this.tempSettings.setActualPlayer(player); } int getSettingsDiff() { diff --git a/src/Program/Settings.java b/src/Program/Settings.java index 5b7745aac0b3213a6225714a9cbbf47591c81dd4..59f5098f88c49fa459e3d3bd5d91f41fbc004e31 100644 --- a/src/Program/Settings.java +++ b/src/Program/Settings.java @@ -29,7 +29,10 @@ public class Settings implements Serializable public String saveFileName; public ArrayList<Player> players; - + public void setActualPlayer(Player actualPlayer) + { + this.actualPlayer = actualPlayer; + } public Settings(Settings progSettings) { this.size = progSettings.size; @@ -66,6 +69,16 @@ public class Settings implements Serializable this.saveFileName = "settings2.dat"; } + + public void postLoadPatch() + { + Player player = new Player(); + player.date = this.actualPlayer.date; + player.maxScore = this.actualPlayer.maxScore; + player.name = this.actualPlayer.name; + + this.actualPlayer = player; + } public void setBoardSize(int newSize) { this.size = newSize; @@ -100,7 +113,7 @@ public class Settings implements Serializable in.close(); fileIn.close(); - + this.postLoadPatch(); } catch(IOException i) {