From 97d57fb05c1df578beef8f1f911b14a4bbc38b23 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 21 Feb 2013 09:00:21 +0000 Subject: [PATCH] NPE trying to scale a missing image --- src/main/java/forge/ImageCache.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/ImageCache.java b/src/main/java/forge/ImageCache.java index 35a5cd5f4ff..2ab6bb6656d 100644 --- a/src/main/java/forge/ImageCache.java +++ b/src/main/java/forge/ImageCache.java @@ -88,8 +88,10 @@ public class ImageCache { } boolean mayEnlarge = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_SCALE_LARGER); - BufferedImage original = getImage(key); + if ( null == original ) + return null; + double scale = Math.min((double) width / original.getWidth(), (double) height / original.getHeight()); // here would be the place to limit the scaling option in menu ? if ((scale > 1) && !mayEnlarge) {