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

Ensure existing global IEmulator is disposed when reassigning it

This commit is contained in:
YoshiRulz 2021-01-09 23:02:22 +10:00
parent 5078ac392b
commit 71ad6deff3
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3679,6 +3679,7 @@ namespace BizHawk.Client.EmuHawk
if (result) if (result)
{ {
string openAdvancedArgs = $"*{OpenAdvancedSerializer.Serialize(ioa)}"; string openAdvancedArgs = $"*{OpenAdvancedSerializer.Serialize(ioa)}";
Emulator.Dispose();
Emulator = loader.LoadedEmulator; Emulator = loader.LoadedEmulator;
InputManager.SyncControls(Emulator, MovieSession, Config); InputManager.SyncControls(Emulator, MovieSession, Config);
@ -3939,6 +3940,7 @@ namespace BizHawk.Client.EmuHawk
if (Tools.AskSave()) if (Tools.AskSave())
{ {
CloseGame(clearSram); CloseGame(clearSram);
Emulator.Dispose();
Emulator = new NullEmulator(); Emulator = new NullEmulator();
Game = GameInfo.NullInstance; Game = GameInfo.NullInstance;
CreateRewinder(); CreateRewinder();