From fd28a593f6a6f6c59c1ea1a2ee59298fc52e714e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 22 Dec 2014 00:59:39 +0000
Subject: [PATCH] Ram Watch - add a null check on Restart()

---
 BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index a527d58f51..f9beeb0555 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -196,7 +196,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			if (!string.IsNullOrWhiteSpace(_watches.CurrentFileName))
+			if (_watches != null && !string.IsNullOrWhiteSpace(_watches.CurrentFileName))
 			{
 				_watches.RefreshDomans(_core, _core.MemoryDomains.MainMemory);
 				_watches.Reload();