From a0b181e6fe13d2cb11912d6506940d6c197729e1 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 30 Nov 2013 00:51:09 +0000
Subject: [PATCH] Don't filter out multicolor cards after right-clicking a
 color filter

---
 .../gui/deckeditor/controllers/CCardCatalog.java      | 11 +++++++++++
 .../gui/workshop/controllers/CWorkshopCatalog.java    | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
index 4304bd50a1c..1e948952d74 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
@@ -116,6 +116,7 @@ public enum CCardCatalog implements ICDoc {
             final int group = st.group;
             if (group > 0) {
                 statLabel.setRightClickCommand(new Command() {
+                    @SuppressWarnings("incomplete-switch")
                     @Override
                     public void run() {
                         if (!disableFiltering) {
@@ -126,6 +127,16 @@ public enum CCardCatalog implements ICDoc {
                                 if (s.group == group && s != st) {
                                     FLabel lbl = VCardCatalog.SINGLETON_INSTANCE.getItemManager().getStatLabel(s);
                                     if (lbl.getSelected()) {
+                                        if (s == StatTypes.MULTICOLOR) {
+                                            switch (st) {
+                                            case WHITE:
+                                            case BLUE:
+                                            case BLACK:
+                                            case RED:
+                                            case GREEN:
+                                                continue; //don't filter out multicolor cards after right-clicking a color filter
+                                            }
+                                        }
                                         foundSelected = true;
                                         lbl.setSelected(false);
                                     }
diff --git a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java
index 5de51c82ad3..d2464868407 100644
--- a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java
+++ b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java
@@ -104,6 +104,7 @@ public enum CWorkshopCatalog implements ICDoc {
             final int group = st.group;
             if (group > 0) {
                 statLabel.setRightClickCommand(new Command() {
+                    @SuppressWarnings("incomplete-switch")
                     @Override
                     public void run() {
                         if (!disableFiltering) {
@@ -114,6 +115,16 @@ public enum CWorkshopCatalog implements ICDoc {
                                 if (s.group == group && s != st) {
                                     FLabel lbl = VWorkshopCatalog.SINGLETON_INSTANCE.getCardManager().getStatLabel(s);
                                     if (lbl.getSelected()) {
+                                        if (s == StatTypes.MULTICOLOR) {
+                                            switch (st) {
+                                            case WHITE:
+                                            case BLUE:
+                                            case BLACK:
+                                            case RED:
+                                            case GREEN:
+                                                continue; //don't filter out multicolor cards after right-clicking a color filter
+                                            }
+                                        }
                                         foundSelected = true;
                                         lbl.setSelected(false);
                                     }