From 4fe33c6c9ba5f1913bbe66c2844e9d83279c2a00 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 29 Nov 2014 16:41:45 +0000
Subject: [PATCH] Prevent crash in CardDetailPanel::setCard

---
 .../src/main/java/forge/gui/CardDetailPanel.java           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
index c579a8b7808..1ba8cc91805 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
@@ -178,8 +178,13 @@ public class CardDetailPanel extends SkinnedPanel {
         setInfoLabel.setBorder(null);
         cdArea.setText("");
 
+        if (card == null) {
+            updateBorder(null, false);
+            return;
+        }
+
         final CardStateView state = card.getState(isInAltState);
-        if (card == null || state == null) {
+        if (state == null) {
             updateBorder(null, false);
             return;
         }