From 9ba5e7d5781bead4a23b29199ac7e49bb240405b Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sun, 13 Nov 2011 10:22:33 +0000
Subject: [PATCH] FSkin bug fix made a new instance of FSkin.  Removed this and
 used a pre-existing instance instead.

---
 src/main/java/forge/view/swing/ApplicationView.java | 2 --
 src/main/java/forge/view/swing/Main.java            | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/view/swing/ApplicationView.java b/src/main/java/forge/view/swing/ApplicationView.java
index 11081786481..85f8ba43c06 100644
--- a/src/main/java/forge/view/swing/ApplicationView.java
+++ b/src/main/java/forge/view/swing/ApplicationView.java
@@ -112,8 +112,6 @@ public class ApplicationView implements FView {
             OldGuiNewGame.getUpldDrftCheckBox().setSelected(preferences.isUploadDraftAI());
             OldGuiNewGame.getFoilRandomCheckBox().setSelected(preferences.isRandCFoil());
 
-            AllZone.setSkin(new FSkin(preferences.getSkin()));
-
         } catch (final Exception exn) {
             Log.error("Error loading preferences: " + exn);
         }
diff --git a/src/main/java/forge/view/swing/Main.java b/src/main/java/forge/view/swing/Main.java
index ce5f885cefd..645618ded29 100644
--- a/src/main/java/forge/view/swing/Main.java
+++ b/src/main/java/forge/view/swing/Main.java
@@ -1,5 +1,6 @@
 package forge.view.swing;
 
+import forge.AllZone;
 import forge.Singletons;
 import forge.error.ErrorViewer;
 import forge.error.ExceptionHandler;
@@ -34,6 +35,7 @@ public final class Main {
             final FSkin skin = new FSkin(model.getPreferences().getSkin());
             final FView view = new ApplicationView(skin);
             Singletons.setView(view);
+            AllZone.setSkin(skin);
 
             // Need this soon after card factory is loaded
             OldGuiNewGame.loadDynamicGamedata();