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

fix ramwatch crashing bug involving core reboots and watchlist hanging on to stale emulator instances

This commit is contained in:
zeromus 2016-02-23 14:42:47 -06:00
parent 1e26688c19
commit 75df712563
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Client.Common
private static readonly WatchChangeCountComparer changeCountComparer = new WatchChangeCountComparer(); private static readonly WatchChangeCountComparer changeCountComparer = new WatchChangeCountComparer();
private static readonly WatchNoteComparer noteComparer = new WatchNoteComparer(); private static readonly WatchNoteComparer noteComparer = new WatchNoteComparer();
private static IMemoryDomains _memoryDomains; private IMemoryDomains _memoryDomains;
private List<Watch> _watchList = new List<Watch>(0); private List<Watch> _watchList = new List<Watch>(0);
private string _currentFilename = string.Empty; private string _currentFilename = string.Empty;
@ -58,11 +58,7 @@ namespace BizHawk.Client.Common
/// <param name="systemid">System identifier (NES, SNES, ...)</param> /// <param name="systemid">System identifier (NES, SNES, ...)</param>
public WatchList(IMemoryDomains core, string systemid) public WatchList(IMemoryDomains core, string systemid)
{ {
if (_memoryDomains == null) _memoryDomains = core;
{
_memoryDomains = core;
}
_systemid = systemid; _systemid = systemid;
} }