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

Timestamp:

2009-12-13T09:30:46+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4159: NPE when deleting a data layer

File:

• trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -62 +62 @@
     }
 
+    /* --------------------------------------------------------------------------- */
+    /* interface LayerChangeListener                                               */
+    /* --------------------------------------------------------------------------- */
     public void activeLayerChange(Layer a, Layer b) {
         if (a != null && a instanceof OsmDataLayer) {
@@ -69 +72 @@
             ((OsmDataLayer)b).data.addDataSetListener(myListener);
         }
-        processDatasetEvent(new DataChangedEvent(Main.main.getEditLayer().data));
+        if (Main.main.getEditLayer() != null) {
+            processDatasetEvent(new DataChangedEvent(Main.main.getEditLayer().data));
+        }
     }
     public void layerRemoved(Layer a) {/* irrelevant in this context */}