Fix up GameSettings in ConnectionControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@550 72836036-5685-4462-b002-a69064685172

1 files changed, 1 insertions, 7 deletions

diff --git a/src/jrummikub/control/network/GameJoinControl.java b/src/jrummikub/control/network/GameJoinControl.java
index d846ebc..cbdc4de 100644
--- a/src/jrummikub/control/network/GameJoinControl.java
+++ b/src/jrummikub/control/network/GameJoinControl.java
@@ -2,7 +2,6 @@ package jrummikub.control.network;
 
 import java.util.UUID;
 
-import jrummikub.model.GameSettings;
 import jrummikub.util.Event;
 import jrummikub.util.GameData;
 import jrummikub.util.IEvent;
@@ -31,7 +30,6 @@ public class GameJoinControl extends AbstractGameBeginControl {
 			final GameData gameData, final IView view) {
 		super(connectionControl, view, gameData, SettingsMode.NETWORK_JOIN);
 
-		NetworkControl.fixGameSettings(gameData.getGameSettings(), connectionControl.getNickname());
 		updateSettingsPanel();
 
 		connections.add(connectionControl.getGameOfferEvent().add(
@@ -39,11 +37,7 @@ public class GameJoinControl extends AbstractGameBeginControl {
 					@Override
 					public void handle(GameData data) {
 						if (data.getGameID().equals(gameData.getGameID())) {
-							GameSettings settings = data.getGameSettings();
-
-							NetworkControl.fixGameSettings(settings, connectionControl.getNickname());
-
-							gameData.setGameSettings(settings);
+							gameData.setGameSettings(data.getGameSettings());
 
 							updateSettingsPanel();
 						}