ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rewinder was being disabled as an approximation for clearing it when loading state while in a movie session. change it to actually just clear it (by recreating it). I decided this was safer than making the rewinder learn how to clear itself. Should fix #2280

This commit is contained in:
zeromus 2020-08-10 03:46:48 -04:00
parent 337f71357e
commit 8fbd45b03f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -887,13 +887,17 @@ namespace BizHawk.Client.EmuHawk
public IRewinder Rewinder { get; private set; }
public void CreateRewinder()
{
RecreateRewinder();
AddOnScreenMessage(Rewinder?.Active == true ? "Rewind started" : "Rewind disabled");
}
void RecreateRewinder()
{
Rewinder?.Dispose();
Rewinder = Emulator.HasSavestates() && Config.Rewind.Enabled
? new Zwinder(Emulator.AsStatable(), Config.Rewind)
: null;
AddOnScreenMessage(Rewinder?.Active == true ? "Rewind started" : "Rewind disabled");
}
private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
@ -3984,9 +3988,11 @@ namespace BizHawk.Client.EmuHawk
UpdateToolsLoadstate();
InputManager.AutoFireController.ClearStarts();
//we don't want to analyze how to intermix movies, rewinding, and states
//so purge rewind history when loading a state while doing a movie
if (!IsRewindSlave && MovieSession.Movie.IsActive())
{
DisableRewind();
RecreateRewinder();
}
if (!suppressOSD)