Changeset 13882 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2018-06-03T19:21:09+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16339 - fix NPE

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1182 +1182 @@
 
         // This happens when nothing is selected, but we still want to highlight the "target node"
-        if (mouseOnExistingNode == null && mousePos != null && getLayerManager().getEditDataSet().selectionEmpty()) {
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (mouseOnExistingNode == null && mousePos != null && ds != null && ds.selectionEmpty()) {
             mouseOnExistingNode = mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
         }