From 4a7321b09691119186dc833d4eb0a06a85926a50 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 29 Jan 2017 20:21:47 -0600
Subject: [PATCH] Ram watch - yet another tweak to restart logic, ugh

---
 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 ef9561f73b..8cb3ca8055 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -218,7 +218,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (_watches != null
 				&& !string.IsNullOrWhiteSpace(_watches.CurrentFileName)
-				&& _watches.All(w => _memoryDomains.Select(m => m.Name).Contains(w.Domain.Name))
+				&& _watches.All(w => w.Domain == null || _memoryDomains.Select(m => m.Name).Contains(w.Domain.Name))
 				&& (Global.Config.RecentWatches.AutoLoad || (IsHandleCreated || !IsDisposed))
 				)
 			{