From 99f073266df91fcf052548522144f7838b894571 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 15 Aug 2012 01:35:17 +0000
Subject: [PATCH] Ram Watch - fix bug where values are not updating after  a
 power cycle/rom load/movie load

---
 BizHawk.MultiClient/tools/RamWatch.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 2a34b095d6..63cc4e3849 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -44,11 +44,19 @@ namespace BizHawk.MultiClient
 
 		public void Restart()
 		{
-			if (!this.IsHandleCreated || this.IsDisposed) return;
+			if ((!this.IsHandleCreated || this.IsDisposed) && !Global.Config.DisplayRamWatch)
+			{
+				return;
+			}
+
 			if (currentFile.Length > 0)
+			{
 				LoadWatchFile(currentFile, false);
+			}
 			else
+			{
 				NewWatchList(true);
+			}
 		}
 
 		public List<Watch> GetRamWatchList()
@@ -67,7 +75,10 @@ namespace BizHawk.MultiClient
 
 		public void UpdateValues()
 		{
-			if ((!this.IsHandleCreated || this.IsDisposed) && !Global.Config.DisplayRamWatch) return;
+			if ((!this.IsHandleCreated || this.IsDisposed) && !Global.Config.DisplayRamWatch)
+			{
+				return;
+			}
 
 			for (int x = 0; x < watchList.Count; x++)
 			{