Changeset 5257 in josm

Timestamp:

May 31, 2012 3:45:02 PM (12 months ago)

Author:

simon04

Message:

see #7701 - NPE in MapImage

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -65 +65 @@
                         synchronized (MapImage.this) {
                             if (result == null) {
-                                img = (BufferedImage) MapPaintStyles.getNoIcon_Icon(source).getImage();
+                                ImageIcon noIcon = MapPaintStyles.getNoIcon_Icon(source);
+                                img = noIcon == null ? null : (BufferedImage) noIcon.getImage();
                             } else {
                                 img = (BufferedImage) result.getImage();