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

Fix logic that news up new Rewinders, properly dispose of the Rewinder on closeRom, this might fix memory leaks in rewinder that pre-date the recent refactor

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

2
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -385,7 +385,9 @@ namespace BizHawk.Client.EmuHawk
private void CloseRomMenuItem_Click(object sender, EventArgs e) private void CloseRomMenuItem_Click(object sender, EventArgs e)
{ {
Console.WriteLine($"Closing rom clicked Frame: {Emulator.Frame} Emulator: {Emulator.GetType().Name}");
CloseRom(); CloseRom();
Console.WriteLine($"Closing rom clicked DONE Frame: {Emulator.Frame} Emulator: {Emulator.GetType().Name}");
} }
private void Savestate1MenuItem_Click(object sender, EventArgs e) { SaveQuickSave("QuickSave1"); } private void Savestate1MenuItem_Click(object sender, EventArgs e) { SaveQuickSave("QuickSave1"); }

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

@ -885,11 +885,9 @@ namespace BizHawk.Client.EmuHawk
public void CreateRewinder() public void CreateRewinder()
{ {
Rewinder?.Dispose(); Rewinder?.Dispose();
Rewinder = Emulator.HasSavestates()
if (Emulator.HasSavestates()) ? new Rewinder(Emulator.AsStatable(), Config.Rewind)
{ : null;
Rewinder = new Rewinder(Emulator.AsStatable(), Config.Rewind);
}
} }
private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager; private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
@ -3957,7 +3955,7 @@ namespace BizHawk.Client.EmuHawk
CloseGame(clearSram); CloseGame(clearSram);
Emulator = new NullEmulator(); Emulator = new NullEmulator();
GlobalWin.Game = GameInfo.NullInstance; GlobalWin.Game = GameInfo.NullInstance;
CreateRewinder();
Tools.Restart(Emulator); Tools.Restart(Emulator);
RewireSound(); RewireSound();
ClearHolds(); ClearHolds();