From aad92334aaae1ed705ae7fb3635bab378b4305ad Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Sun, 8 May 2011 15:57:23 -0400
Subject: [PATCH] fixed Issue 43

---
 .../main/java/mage/client/deckeditor/CardSelector.java | 10 ++++++++++
 .../java/mage/client/deckeditor/DeckEditorPanel.java   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index 760f1c9b610..282d530b247 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -153,6 +153,16 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 		return this.cardGrid;
 	}
 
+	public void removeCard(UUID cardId) {
+		this.cardGrid.removeCard(cardId);
+		for (Card card: cards) {
+			if (card.getId().equals(cardId)) {
+				cards.remove(card);
+				break;
+			}
+		}
+	}
+
 	public Card getCard(UUID cardId) {
 		if (!cards.isEmpty()) {
 			for (Card card: cards) {
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index 9b7114ae341..fbad20489be 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -158,7 +158,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
 							deck.getCards().add(Sets.createCard(card.getClass()));
 							if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) {
 								deck.getSideboard().remove(card);
-								cardSelector.getCardsList().removeCard(card.getId());
+								cardSelector.removeCard(card.getId());
 							}
 							if (cardInfoPane instanceof  CardInfoPane)  {
 								((CardInfoPane)cardInfoPane).setCard(new CardView(card));