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

Fix exception on GBA when selecting reboot core (or loading a movie, or any other type of core restart). This commit should be peer reviewed

This commit is contained in:
adelikat 2014-06-21 21:39:18 +00:00
parent 762048018e
commit 7f76347c0a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3018,7 +3018,9 @@ namespace BizHawk.Client.EmuHawk
// this also happens in CloseGame(). but it needs to happen here since if we're restarting with the same core, // this also happens in CloseGame(). but it needs to happen here since if we're restarting with the same core,
// any settings changes that we made need to make it back to config before we try to instantiate that core with // any settings changes that we made need to make it back to config before we try to instantiate that core with
// the new settings objects // the new settings objects
CommitCoreSettingsToConfig(); CommitCoreSettingsToConfig(); // adelikat: I Think by reordering things, this isn't necessary anymore
CloseGame();
Global.Emulator.Dispose();
var nextComm = CreateCoreComm(); var nextComm = CreateCoreComm();
CoreFileProvider.SyncCoreCommInputSignals(nextComm); CoreFileProvider.SyncCoreCommInputSignals(nextComm);
@ -3035,8 +3037,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
CloseGame();
Global.Emulator.Dispose();
Global.Emulator = loader.LoadedEmulator; Global.Emulator = loader.LoadedEmulator;
Global.CoreComm = nextComm; Global.CoreComm = nextComm;
Global.Game = loader.Game; Global.Game = loader.Game;