Changeset 5074 in josm

Timestamp:

Mar 12, 2012 7:54:24 AM (15 months ago)

Author:

akks

Message:

Fix NPE for disabled image loading, see #7498, #7491 (please check!)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java (modified) (2 diffs)

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

@@ -20 +20 @@
 public class MapImage {
     /**
-     * ImageIcon can chage while the image is loading.
+     * ImageIcon can change while the image is loading.
      */
     private BufferedImage img;
@@ -44 +44 @@
         if (disabledImg != null)
             return disabledImg;
+        if (img == null)
+            getImage(); // fix #7498 ?
         return disabledImg = GrayFilter.createDisabledImage(img);
     }