Skip to content

Do not disable recording mode when loading a branch. #4475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2025
Merged

Do not disable recording mode when loading a branch. #4475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,8 @@ public bool FrameEdited(int frame)
{
GreenzoneInvalidatedCallback?.Invoke(frame); // lua callback

if (_suspendEditLogic) return false;

// Recording multiple frames, or auto-extending the movie, while unpaused should count as a single undo action.
if (CurrentTasMovie.LastEditWasRecording && !MainForm.EmulatorPaused)
{
Expand Down
3 changes: 3 additions & 0 deletions src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,7 @@ private void HandleRotationChanged(object sender, EventArgs e)
TasView.AllColumns.ColumnsChanged();
}

private bool _suspendEditLogic;
public void LoadBranch(TasBranch branch)
{
if (Settings.OldControlSchemeForBranches && !TasPlaybackBox.RecordingMode)
Expand All @@ -1186,7 +1187,9 @@ public void LoadBranch(TasBranch branch)
return;
}

_suspendEditLogic = true;
CurrentTasMovie.LoadBranch(branch);
_suspendEditLogic = false;
LoadState(new(branch.Frame, new MemoryStream(branch.CoreData, false)));

CurrentTasMovie.TasStateManager.Capture(Emulator.Frame, Emulator.AsStatable());
Expand Down