Skip to content

Commit ab98875

Browse files
committed
Fix: Recording a frame while unpaused, immediately after an undo, could merge unrelated undo actions.
1 parent 4f59cbe commit ab98875

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ private void EditSubMenu_DropDownOpened(object sender, EventArgs e)
285285
private void UndoMenuItem_Click(object sender, EventArgs e)
286286
{
287287
CurrentTasMovie.ChangeLog.Undo();
288+
_extendNeedsMerge = false;
288289
}
289290

290291
private void RedoMenuItem_Click(object sender, EventArgs e)

src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ private void UndoToHere(int index)
8787
{
8888
while (Log.UndoIndex > index)
8989
{
90-
Log.Undo();
90+
// Although we have a reference to the Log, TAStudio needs to do a little extra on undo.
91+
_tastudio.UndoExternal();
9192
}
9293
});
9394

0 commit comments

Comments
 (0)