Changeset 2660 in josm for trunk/src


Ignore:
Timestamp:
2009-12-19T18:13:42+01:00 (12 years ago)
Author:
jttt
Message:

Fixed #4205 NPE on reordering layers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java

    r2658 r2660  
    1010
    1111import org.openstreetmap.josm.Main;
     12import org.openstreetmap.josm.data.osm.DataSet;
    1213import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1314import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
     
    5657        dirty = false;
    5758        allData.clear();
    58         addPrimitives(Main.main.getCurrentDataSet().allNonDeletedPrimitives());
     59        DataSet currentDataset = Main.main.getCurrentDataSet();
     60        if (currentDataset != null) {
     61            addPrimitives(currentDataset.allNonDeletedPrimitives());
     62        }
    5963    }
    6064
Note: See TracChangeset for help on using the changeset viewer.