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

consolidate logic that instantiates a new rewinder, be sure to dispose the old one

This commit is contained in:
adelikat 2020-06-10 09:15:52 -05:00
parent de5508ca6c
commit af93cf3e92
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Common.BufferExtensions;
using BizHawk.Common.IOExtensions;
using BizHawk.Client.Common;
using BizHawk.Bizware.BizwareGL;
@ -304,8 +303,6 @@ namespace BizHawk.Client.EmuHawk
UpdateStatusSlots();
UpdateKeyPriorityIcon();
try
{
_argParser.ParseArguments(args);
@ -883,7 +880,17 @@ namespace BizHawk.Client.EmuHawk
private Sound Sound => GlobalWin.Sound;
public CheatCollection CheatList => GlobalWin.CheatList;
public IRewinder Rewinder { get; set; }
public IRewinder Rewinder { get; private set; }
public void CreateRewinder()
{
Rewinder?.Dispose();
if (Emulator.HasSavestates())
{
Rewinder = new Rewinder(Emulator.AsStatable(), Config.Rewind);
}
}
private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
@ -3806,16 +3813,7 @@ namespace BizHawk.Client.EmuHawk
CurrentlyOpenRomArgs = args;
OnRomChanged();
DisplayManager.Blank();
if (Emulator.HasSavestates())
{
Rewinder = new Rewinder(Emulator.AsStatable(), Config.Rewind);
}
else
{
Rewinder?.Dispose();
Rewinder = null;
}
CreateRewinder();
GlobalWin.InputManager.StickyXorAdapter.ClearStickies();
GlobalWin.InputManager.StickyXorAdapter.ClearStickyAxes();
@ -4001,7 +3999,10 @@ namespace BizHawk.Client.EmuHawk
return;
}
Rewinder ??= new Rewinder(Emulator.AsStatable(), Config.Rewind);
if (Rewinder == null)
{
CreateRewinder();
}
if (enabled)
{

3
src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
View File

@ -185,8 +185,7 @@ namespace BizHawk.Client.EmuHawk
if (TriggerRewindSettingsReload)
{
_mainForm.Rewinder.Dispose();
_mainForm.Rewinder = new Rewinder(_statableCore, _config.Rewind);
_mainForm.CreateRewinder();
}
DialogResult = DialogResult.OK;