Changeset 6096 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-08-01T07:37:02+02:00 (11 years ago)

Author:

akks

Message:

should fix #8927: NPE in select mode after delete active data layer

File:

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

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -1180 +1180 @@
      */
     public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
-        Collection<OsmPrimitive> sel =
-                use_selected ? getCurrentDataSet().getSelected() : null;
+        Collection<OsmPrimitive> sel;
+        DataSet ds = getCurrentDataSet();
+        if (use_selected && ds!=null) {
+            sel = ds.getSelected();
+        } else {
+            sel = null;
+        }
         OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel);