Changeset 2660 in josm

Timestamp:

Dec 19, 2009 6:13:42 PM (3 years ago)

Author:

jttt

Message:

Fixed #4205 NPE on reordering layers

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -56 +57 @@
         dirty = false;
         allData.clear();
-        addPrimitives(Main.main.getCurrentDataSet().allNonDeletedPrimitives());
+        DataSet currentDataset = Main.main.getCurrentDataSet();
+        if (currentDataset != null) {
+            addPrimitives(currentDataset.allNonDeletedPrimitives());
+        }
     }