Changeset 5223 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-05-08T02:20:58+02:00 (12 years ago)

Author:

Don-vip

Message:

should fix #7620 - NPE in unknown conditions (not reproduced)

File:

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

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

@@ -151 +151 @@
 
         // update selection to reflect which way being modified
-        if (currentBaseNode != null && getCurrentDataSet().getSelected().isEmpty() == false) {
+        if (currentBaseNode != null && getCurrentDataSet() != null && getCurrentDataSet().getSelected().isEmpty() == false) {
             Way continueFrom = getWayForNode(currentBaseNode);
             if (alt && continueFrom != null && (!currentBaseNode.isSelected() || continueFrom.isSelected())) {