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

Timestamp:

2020-11-23T20:52:54+01:00 (3 years ago)

Author:

GerdP

Message:

fix #20098: Corrupted undo/redo stack after unsuccesful undo

• Keep undo/redo stack intact if Command.undo() throws Execption

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -378 +378 @@
                 for (int i = 1; i <= num; ++i) {
                     final Command c = commands.removeLast();
-                    c.undoCommand();
+                    try {
+                        c.undoCommand();
+                    } catch (Exception e) { // NOPMD
+                        // fix #20098: restore command stack as we will not fire an event
+                        commands.add(c);
+                        throw e;
+                    }
                     redoCommands.addFirst(c);
                     fireEvent(new CommandUndoneEvent(this, c));