From 653fb0ff384ca46b8a3980408dd82dc3790690a5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 11 May 2014 12:09:41 +0000
Subject: [PATCH] Ram Watch - set the CurrentFileName property during LoadFile,
 fixes some subtle bugs that resulted from a loaded watch with an empty name

---
 BizHawk.Client.Common/tools/WatchList.cs       | 1 +
 BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/tools/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs
index 2a03617eea..c5b9225be7 100644
--- a/BizHawk.Client.Common/tools/WatchList.cs
+++ b/BizHawk.Client.Common/tools/WatchList.cs
@@ -525,6 +525,7 @@ namespace BizHawk.Client.Common
 				}
 
 				Domain = Global.Emulator.MemoryDomains[domain] ?? Global.Emulator.MemoryDomains.MainMemory;
+				_currentFilename = path;
 			}
 
 			if (!append)
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 6f880c1da5..1868adc1ea 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -517,8 +517,6 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			var test1 = _watches.Any(watch => (watch.Address ?? 0) >= watch.Domain.Size);
-
 			ErrorIconButton.Visible = _watches.Any(watch => (watch.Address ?? 0) >= watch.Domain.Size);
 
 			MessageLabel.Text = message;