Changeset 1633 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-06-06T13:21:56+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2688 - patch by jttt - solve NPE

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -167 +167 @@
      */
     public final void removeLayer(final Layer layer) {
-        map.mapView.removeLayer(layer);
-        if (layer instanceof OsmDataLayer)
-            ds = new DataSet();
-        if (map.mapView.getAllLayers().isEmpty())
-            setMapFrame(null);
+        if (map != null) {
+            map.mapView.removeLayer(layer);
+            if (layer instanceof OsmDataLayer)
+                ds = new DataSet();
+            if (map.mapView.getAllLayers().isEmpty())
+                setMapFrame(null);
+        }
     }