From 04dde1c18df0e3faaf8ece75c2fb8fa5c9239d6c Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 5 Jan 2014 08:23:22 +0000 Subject: [PATCH] Fix crash when closing Spell Shop --- forge-gui/src/main/java/forge/gui/toolbox/FSkin.java | 4 ++++ .../forge/gui/toolbox/itemmanager/views/ItemListView.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index 0de58bb2e44..772526ebb82 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -96,6 +96,10 @@ public enum FSkin { this.comp = comp0; } + public boolean isDisposed() { + return this.comp == null; + } + public SkinColor getForeground() { return this.foreground; } diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java index b51c6191af4..cced04cd9f6 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java @@ -94,7 +94,7 @@ public final class ItemListView extends ItemView { this.table.addFocusListener(new FocusListener() { @Override public void focusLost(FocusEvent e) { - if (!e.isTemporary()) { + if (!e.isTemporary() && !skin.isDisposed()) { skin.setSelectionBackground(FSkin.getColor(FSkin.Colors.CLR_INACTIVE)); } }