From cb3e454002c116aee6d6de42511350ff114bdf03 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sat, 4 Dec 2010 20:20:27 +0000
Subject: [PATCH] Fixed test mode (Issue 35): now uses server test mode state.

---
 Mage.Client/src/main/java/mage/client/MageFrame.java       | 7 -------
 .../src/main/java/mage/client/table/TablesPanel.java       | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 457d4ae4768..3da0f748b9b 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -97,7 +97,6 @@ public class MageFrame extends javax.swing.JFrame {
 	private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
 	private JLabel title;
 	private Rectangle titleRectangle;
-	public final static String testModeArg = "-testMode=";
 	
 	/**
 	 * @return the session
@@ -555,12 +554,6 @@ public class MageFrame extends javax.swing.JFrame {
 	    	splash.update();
     	}
     	
-    	for (String arg: args) {
-			if (arg.startsWith(testModeArg)) {
-				System.setProperty(testModeArg, "true");
-			}
-		}
-    	
 		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
 			public void uncaughtException(Thread t, Throwable e) {
 				logger.log(Level.SEVERE, null, e);
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index ab6528e2339..70d279e701e 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -152,7 +152,9 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
 
 		this.roomId = roomId;
 		session = MageFrame.getSession();
-		btnQuickStart.setVisible(System.getProperty(MageFrame.testModeArg) != null);
+		if (session != null) {
+			btnQuickStart.setVisible(session.isTestMode());
+		}
 		if (newTableDialog == null) {
 			newTableDialog = new NewTableDialog();
 			MageFrame.getDesktop().add(newTableDialog);