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

Timestamp:

2017-10-09T01:26:48+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15126 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (4 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.SelectByInternalPointAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -373 +374 @@
         }
 
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         if (clicked) {
             Point center = new Point(selectionResult.xpoints[0], selectionResult.ypoints[0]);
@@ -379 +381 @@
                 selection.add(osm);
             }
-        } else {
+        } else if (ds != null) {
             // nodes
-            for (Node n : MainApplication.getLayerManager().getEditDataSet().getNodes()) {
+            for (Node n : ds.getNodes()) {
                 if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
                     selection.add(n);
@@ -388 +390 @@
 
             // ways
-            for (Way w : MainApplication.getLayerManager().getEditDataSet().getWays()) {
+            for (Way w : ds.getWays()) {
                 if (!w.isSelectable() || w.getNodesCount() == 0) {
                     continue;