From f3344863ac728b98d12d926935e3b48f9e85c4bc Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 14 Nov 2013 19:39:57 +0000
Subject: [PATCH] When loading a ram watch file, default to main memory when
 unable to find the domain saved in the file

---
 BizHawk.Client.Common/tools/WatchList.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/tools/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs
index 8c4c1f5879..6c06f9a38c 100644
--- a/BizHawk.Client.Common/tools/WatchList.cs
+++ b/BizHawk.Client.Common/tools/WatchList.cs
@@ -482,7 +482,7 @@ namespace BizHawk.Client.Common
 						startIndex = line.IndexOf('\t') + 1;
 						line = line.Substring(startIndex, line.Length - startIndex);   //Domain
 						temp = line.Substring(0, line.IndexOf('\t'));
-						memDomain = Global.Emulator.MemoryDomains[temp];
+						memDomain = Global.Emulator.MemoryDomains[temp] ?? Global.Emulator.MemoryDomains.MainMemory;
 					}
 
 					startIndex = line.IndexOf('\t') + 1;