From f57b52a048b62360f9f949f36f6ae44e07275e24 Mon Sep 17 00:00:00 2001
From: melvin <unknown>
Date: Wed, 13 Jul 2011 17:01:35 +0800
Subject: [PATCH] start MagicFrame using invokeLater

---
 src/magic/MagicMain.java     | 7 ++++++-
 src/magic/ui/MagicFrame.java | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/magic/MagicMain.java b/src/magic/MagicMain.java
index e087831c7a..a2d311bad2 100644
--- a/src/magic/MagicMain.java
+++ b/src/magic/MagicMain.java
@@ -3,6 +3,7 @@ package magic;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import javax.swing.SwingUtilities;
 
 import magic.data.CardDefinitions;
 import magic.data.CardEventDefinitions;
@@ -37,7 +38,11 @@ public class MagicMain {
 	
 	public static void main(String args[]) throws IOException {		
 		initialize();
-        new MagicFrame();
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                new MagicFrame();
+            }
+        });
 	}	
 
 	public static String getGamePath() {
diff --git a/src/magic/ui/MagicFrame.java b/src/magic/ui/MagicFrame.java
index 474c8994c4..f362849c57 100644
--- a/src/magic/ui/MagicFrame.java
+++ b/src/magic/ui/MagicFrame.java
@@ -287,7 +287,6 @@ public class MagicFrame extends JFrame implements ActionListener {
 	}
 	
 	public void showTournament() {
-
 		gamePanel=null;
 		if (tournament!=null) {
 			final TournamentPanel newTournamentPanel=new TournamentPanel(this,tournament);
@@ -395,27 +394,23 @@ public class MagicFrame extends JFrame implements ActionListener {
 	}
 	
 	public void resetGame() {
-		
 		if (gamePanel!=null) {
 			gamePanel.getController().resetGame();
 		}
 	}
 	
 	public void concedeGame() {
-		
 		if (gamePanel!=null) {
 			gamePanel.getController().concede();
 		}
 	}
 		
 	public void nextGame() {
-
 		tournament.updateDifficulty();
 		openGame(tournament.nextGame(true));
 	}
 	
 	private void openGame(final MagicGame game) {
-
 		final ZoneBackgroundLabel backgroundLabel=new ZoneBackgroundLabel();
 		backgroundLabel.setGame(true);
 		gamePanel=new GamePanel(this,game,backgroundLabel);