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

Timestamp:

2017-07-25T23:55:03+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #12870 - Undo while extrude causes exception

File:

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

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

@@ -39 +39 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -535 +536 @@
                     addNewNode(e);
                 } else if (e.getPoint().distance(initialMousePos) > initialMoveThreshold && newN1en != null && selectedSegment != null) {
-                    // main extrusion commands
-                    performExtrusion();
+                    try {
+                        // main extrusion commands
+                        performExtrusion();
+                    } catch (DataIntegrityProblemException ex) {
+                        // Can occur if calling undo while extruding, see #12870
+                        Main.error(ex);
+                    }
                 }
             } else if (mode == Mode.translate || mode == Mode.translate_node) {