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

mGBA - fix NRE that can happen when rebooting core, fixes #1915

This commit is contained in:
adelikat 2020-04-09 18:36:25 -05:00
parent 05b39a0ec8
commit 04cd7d867c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs
View File

@ -65,13 +65,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public void Remove(MemoryCallbackDelegate action) public void Remove(MemoryCallbackDelegate action)
{ {
var cbToRemove = _callbacks.Single(container => container.Callback.Callback == action); var cbToRemove = _callbacks.SingleOrDefault(container => container.Callback.Callback == action);
if (cbToRemove != null)
{
if (LibmGBA.BizClearWatchpoint(_mgba.Core, cbToRemove.ID)) if (LibmGBA.BizClearWatchpoint(_mgba.Core, cbToRemove.ID))
{ {
_callbacks.Remove(cbToRemove); _callbacks.Remove(cbToRemove);
} }
} }
}
public void RemoveAll(IEnumerable<MemoryCallbackDelegate> actions) public void RemoveAll(IEnumerable<MemoryCallbackDelegate> actions)
{ {