Changeset 12836 in josm for trunk/src/org

Timestamp:

2017-09-12T23:54:42+02:00 (7 years ago)

Author:

Don-vip

Message:

fix NPE (?) seen in unit test

File:

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

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

@@ -227 +227 @@
         // update selection to reflect which way being modified
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (editLayer != null && getCurrentBaseNode() != null && !editLayer.data.selectionEmpty()) {
+        Node baseNode = getCurrentBaseNode();
+        if (editLayer != null && baseNode != null && !editLayer.data.selectionEmpty()) {
             DataSet currentDataSet = editLayer.data;
-            Way continueFrom = getWayForNode(getCurrentBaseNode());
-            if (alt && continueFrom != null && (!getCurrentBaseNode().isSelected() || continueFrom.isSelected())) {
-                addRemoveSelection(currentDataSet, getCurrentBaseNode(), continueFrom);
+            Way continueFrom = getWayForNode(baseNode);
+            if (alt && continueFrom != null && (!baseNode.isSelected() || continueFrom.isSelected())) {
+                addRemoveSelection(currentDataSet, baseNode, continueFrom);
                 needsRepaint = true;
             } else if (!alt && continueFrom != null && !continueFrom.isSelected()) {