From 8bff9ff14b99a9d56acbff53fc7f2a35fde2ac22 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 2 Dec 2014 00:13:50 +0000
Subject: [PATCH] Prevent flashback cards losing their display area if
 graveyard open

---
 .../src/forge/screens/match/views/VCardDisplayArea.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
index aa2cc150589..deb1787d4c8 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
@@ -119,7 +119,10 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         super.clear();
         if (!cardPanels.isEmpty()) {
             for (CardAreaPanel panel : cardPanels) {
-                panel.reset();
+                if (panel.displayArea == null || panel.displayArea == this ||
+                        !panel.displayArea.cardPanels.contains(panel)) { //don't reset if panel's displayed in another area already
+                    panel.reset();
+                }
             }
             cardPanels.clear();
         }
@@ -332,6 +335,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         }
 
         private void showZoom() {
+            if (displayArea == null) { return; }
+
             final List<CardView> cards = displayArea.orderedCards;
             CardZoom.show(cards, cards.indexOf(getCard()), displayArea);
         }