From 732307580ea926c1180c03b17f78422480f69f08 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sun, 11 Dec 2011 08:55:12 +0000
Subject: [PATCH] Updates to ViewConstructed in home screen.

---
 src/main/java/forge/control/ControlAllUI.java    |  3 +++
 .../java/forge/view/home/ViewConstructed.java    | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/forge/control/ControlAllUI.java b/src/main/java/forge/control/ControlAllUI.java
index ecd2901b32c..d115101222b 100644
--- a/src/main/java/forge/control/ControlAllUI.java
+++ b/src/main/java/forge/control/ControlAllUI.java
@@ -143,6 +143,9 @@ public class ControlAllUI {
     private void sizeChildren() {
         Component[] children;
         children = ControlAllUI.this.display.getComponentsInLayer(JLayeredPane.DEFAULT_LAYER);
+
+        if (children.length == 0) { return; }
+
         children[0].setSize(ControlAllUI.this.display.getSize());
 
         children = ControlAllUI.this.display.getComponentsInLayer(JLayeredPane.MODAL_LAYER);
diff --git a/src/main/java/forge/view/home/ViewConstructed.java b/src/main/java/forge/view/home/ViewConstructed.java
index 3fb355533b2..1023dce0cdb 100644
--- a/src/main/java/forge/view/home/ViewConstructed.java
+++ b/src/main/java/forge/view/home/ViewConstructed.java
@@ -5,7 +5,9 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.swing.AbstractAction;
@@ -74,9 +76,21 @@ public class ViewConstructed extends JPanel {
         // Content menu
         String[] colors = {"Random", "Random", "Random",
                 "Random", "Black", "Blue", "Green", "Red", "White"};
-        String[] decks = objectArrayToStringArray(AllZone.getDeckManager().getConstructedDecks().toArray());
+
         String[] themes = objectArrayToStringArray(gen.getThemeNames().toArray());
 
+        Deck d;
+        List<String> decknames = new ArrayList<String>();
+        for (final Deck allDeck : AllZone.getDeckManager().getDecks()) {
+            d = allDeck;
+
+            if (d.getDeckType().equals(GameType.Constructed)) {
+                decknames.add(d.getName());
+            }
+        } // for
+
+        String[] decks = objectArrayToStringArray(decknames.toArray());
+
         lstColorsHuman = new JList(colors);
         lstColorsAI = new JList(colors);
         lstDecksHuman = new JList(decks);