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

Timestamp:

2018-12-15T17:19:00+01:00 (5 years ago)

Author:

GerdP

Message:

fix #16911 regression from r13729 : make sure that redo tree is cleared when a command is added after one or more undos

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -362 +362 @@
     }
 
+    protected boolean redoTreeIsEmpty() {
+        return redoTree.getRowCount() == 0;
+    }
+
     @Override
     public void cleaned(CommandQueueCleanedEvent e) {
@@ -374 +378 @@
             undoRoot.add(getNodeForCommand(e.getCommand()));
             undoTreeModel.nodeStructureChanged(undoRoot);
+            // fix 16911: make sure that redo tree is rebuild with empty list
+            if (!redoTreeIsEmpty())
+                buildRedoTree();
             ensureTreesConsistency();
         }