From 75df712563ec95d0b3e7c90bbf7a113347bc7788 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Tue, 23 Feb 2016 14:42:47 -0600
Subject: [PATCH] fix ramwatch crashing bug involving core reboots and
 watchlist hanging on to stale emulator instances

---
 BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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