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

Timestamp:

2014-04-22T13:05:26+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #7705 - NPE when using piclayer plugin without data layer

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapView;
@@ -55 +56 @@
 
         // the command may have changed the selection so tell the listeners about the current situation
-        Main.main.getCurrentDataSet().fireSelectionChanged();
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (ds != null) {
+            ds.fireSelectionChanged();
+        }
     }