Changeset 6013 in josm

Timestamp:

2013-06-18T20:50:15+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8806 - NPE in SelectAction

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (2 diffs)

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

@@ -850 +850 @@
         // anything if about to drag the virtual node (i.e. !released) but continue if the
         // cursor is only released above a virtual node by accident (i.e. released). See #7018
-        if ((shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
+        if (ds == null || (shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
             return;
 
@@ -857 +857 @@
             // selected object (it breaks moving of selected groups).
             // Do it later, on mouse release.
-            shift |= getCurrentDataSet().getSelected().containsAll(prims);
+            shift |= ds.getSelected().containsAll(prims);
         }