external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Only run the layout code from removeCardPanel if the panel has no attached panels (fixes NPE).

Browse Source
This commit is contained in:
Agetian
2017-01-10 17:30:47 +00:00
parent c1a1d7a210
commit 1eab1f0425
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
View File

@@ -295,7 +295,9 @@ public abstract class CardPanelContainer extends SkinnedPanel {
fromPanel.dispose(); fromPanel.dispose();
getCardPanels().remove(fromPanel); getCardPanels().remove(fromPanel);
remove(fromPanel); remove(fromPanel);
this.doLayout(); if (fromPanel.getAttachedPanels() != null) {
this.doLayout();
}
invalidate(); invalidate();
repaint(); repaint();
} }

3
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -892,9 +892,6 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
} }
private void addAttachedPanels(final CardPanel panel) { private void addAttachedPanels(final CardPanel panel) {
if (panel == null) {
return;
}
for (final CardPanel attachedPanel : panel.getAttachedPanels()) { for (final CardPanel attachedPanel : panel.getAttachedPanels()) {
if (panel.getCard() != null && super.add(attachedPanel)) { if (panel.getCard() != null && super.add(attachedPanel)) {
addAttachedPanels(attachedPanel); addAttachedPanels(attachedPanel);