Fixed a bug in UndoManager when using undoCurrentTransactionOnly

juce-framework · Aug 15, 2016 · 91f2453 · 91f2453
1 parent 2417676
commit 91f2453
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/modules/juce_data_structures/undomanager/juce_UndoManager.cpp b/modules/juce_data_structures/undomanager/juce_UndoManager.cpp
@@ -171,15 +171,20 @@ void UndoManager::moveFutureTransactionsToStash()
 
         while (nextIndex < transactions.size())
         {
-            totalUnitsStored -= transactions.getLast()->getTotalSize();
-            stashedFutureTransactions.add (transactions.removeAndReturn (nextIndex));
+            ActionSet* removed = transactions.removeAndReturn (nextIndex);
+            stashedFutureTransactions.add (removed);
+            totalUnitsStored -= removed->getTotalSize();
         }
     }
 }
 
 void UndoManager::restoreStashedFutureTransactions()
 {
-    jassert (nextIndex == transactions.size());
+    while (nextIndex < transactions.size())
+    {
+        totalUnitsStored -= transactions.getUnchecked (nextIndex)->getTotalSize();
+        transactions.remove (nextIndex);
+    }
 
     for (int i = 0; i < stashedFutureTransactions.size(); ++i)
     {