Prevent flashback cards losing their display area if graveyard open

This commit is contained in:
drdev
2014-12-02 00:13:50 +00:00
parent bc29bc0d50
commit 8bff9ff14b

View File

@@ -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);
}