From 932b3022d95ba7595f9fe0bd4a607721056b5cce Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 21 Jun 2014 02:49:18 +0000 Subject: [PATCH] Prevent crash when removing cards from deck --- .../src/forge/deck/FDeckEditor.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index f9ecc82c074..7d96ada7912 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -447,16 +447,24 @@ public class FDeckEditor extends TabPageScreen { }); } + protected boolean canAddCards() { + return true; + } + public void addCard(PaperCard card) { - cardManager.addItem(card, 1); - parentScreen.getEditorType().getController().notifyModelChanged(); - updateCaption(); + if (canAddCards()) { + cardManager.addItem(card, 1); + parentScreen.getEditorType().getController().notifyModelChanged(); + updateCaption(); + } } public void addCards(Iterable> cards) { - cardManager.addItems(cards); - parentScreen.getEditorType().getController().notifyModelChanged(); - updateCaption(); + if (canAddCards()) { + cardManager.addItems(cards); + parentScreen.getEditorType().getController().notifyModelChanged(); + updateCaption(); + } } public void removeCard(PaperCard card) { @@ -495,8 +503,13 @@ public class FDeckEditor extends TabPageScreen { refresh(); } + @Override + protected boolean canAddCards() { + return false; + } + protected String getItemManagerCaption() { - return "Catalog"; + return "Cards"; } @Override