From a7785b0d1b20a8627dbfd128deb0dba68aa8fad1 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Wed, 29 Jan 2014 10:57:16 +0000
Subject: [PATCH] - disabled checkboxes for Archenemy and Commander in
 constructed match setup. - disabling a variant now updates the deck selector
 as appropriate

---
 .../gui/home/sanctioned/VSubmenuConstructed.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
index ae0af94bd05..387e5db39f4 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
@@ -154,8 +154,10 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
         // Populate and add variants panel
         vntVanguard.addItemListener(iListenerVariants);
         vntCommander.addItemListener(iListenerVariants);
+        vntCommander.setEnabled(false);
         vntPlanechase.addItemListener(iListenerVariants);
         vntArchenemy.addItemListener(iListenerVariants);
+        vntArchenemy.setEnabled(false);
         comboArchenemy.setSelectedIndex(0);
         comboArchenemy.setEnabled(vntArchenemy.isSelected());
         comboArchenemy.addActionListener(aeComboListener);
@@ -954,16 +956,21 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
             }
             
             if ( null != variantType ) {
-                if (arg0.getStateChange() == ItemEvent.SELECTED)
+                if (arg0.getStateChange() == ItemEvent.SELECTED) {
                     appliedVariants.add(variantType);
-                else
+                    currentGameMode = variantType;
+                } else {
                     appliedVariants.remove(variantType);
+                    if (currentGameMode == variantType) {
+                    	currentGameMode = GameType.Constructed;
+                    }
+                }
             }
 
             for (PlayerPanel pp : playerPanels) {
                 pp.updateVariantControlsVisibility();
             }
-            changePlayerFocus(playerWithFocus, variantType);
+            changePlayerFocus(playerWithFocus, currentGameMode);
         }
     };