From a5eeaae0d0bbb395e0a86a6d2da1f820e7dc69ab Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 18 Aug 2017 15:23:08 +0000 Subject: [PATCH] - Prevent a NPE when trying to zoom a card before a single card is selected. --- .../src/main/java/forge/toolbox/special/CardZoomer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java index efc6feb7406..5c3fddbcda1 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/CardZoomer.java @@ -193,6 +193,10 @@ public enum CardZoomer { } private void displayCard() { + if (thisCard == null) { + return; + } + isMouseWheelEnabled = false; setLayout(); setImage();