Changeset 29601 in osm

Timestamp:

2013-05-27T12:09:07+02:00 (11 years ago)

Author:

larry0ua

Message:

PicLayer - #8743 - fixed NPE when removing last layer

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/piclayer/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="PicLayer - #7127 - added world file loading option"/>
+    <property name="commit.message" value="PicLayer - #8743 - fixed NPE when removing last layer"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5960"/>

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -169 +169 @@
                 new SavePictureCalibrationAction((PicLayerAbstract) arg0).actionPerformed(null);
         }
-        boolean enable = Main.map.mapView.getAllLayers().size() != 0;
+        // Why should I do all these checks now?
+        boolean enable = Main.map != null && Main.map.mapView != null && Main.map.mapView.getAllLayers() != null && Main.map.mapView.getAllLayers().size() != 0;
         menu.setEnabled(enable);
     }