From c768b5e8fb3f62b9c17d54a93e3dbd919cbedd32 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 12 May 2013 04:44:44 +0000 Subject: [PATCH] the former black screen at match start: understood how it happens but don't know how to fix yet. --- src/main/java/forge/gui/match/VMatchUI.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/forge/gui/match/VMatchUI.java b/src/main/java/forge/gui/match/VMatchUI.java index 624de737bec..93690484050 100644 --- a/src/main/java/forge/gui/match/VMatchUI.java +++ b/src/main/java/forge/gui/match/VMatchUI.java @@ -110,8 +110,9 @@ public enum VMatchUI implements IVTopLevelUI { // Add extra hands to existing hand panel. for (int i = 0; i < lstHands.size(); i++) { // If already in layout, no need to add again. - if (lstHands.get(i).getParentCell() == null) { - lstHands.get(0).getParentCell().addDoc(lstHands.get(i)); + if (lstHands.get(i).getParentCell() == null) { // if i == 0, we get NPE in two lines + DragCell cellWithHand = lstHands.get(0).getParentCell(); + cellWithHand.addDoc(lstHands.get(i)); } } @@ -151,11 +152,6 @@ public enum VMatchUI implements IVTopLevelUI { this.lstHands = lst0; } - /** @return {@link java.util.List}<{@link forge.gui.match.nonsigleton.VHand}> */ - public List getHandViews() { - return lstHands; - } - /** @return {@link javax.swing.JButton} */ public JButton getBtnCancel() { return VMessage.SINGLETON_INSTANCE.getBtnCancel();