From dca03607be5f55c4594fc4fe72d30a799add696d Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 29 Jan 2017 19:56:09 -0600
Subject: [PATCH] Ram watch - another tweak to previous commit

---
 BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 4dde3a5d84..ef9561f73b 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -218,13 +218,13 @@ 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 => _memoryDomains.Select(m => m.Name).Contains(w.Domain.Name))
+				&& (Global.Config.RecentWatches.AutoLoad || (IsHandleCreated || !IsDisposed))
+				)
 			{
 				_watches.RefreshDomains(_memoryDomains);
 				_watches.Reload();
 				UpdateStatusBar();
-
-				
 			}
 			else
 			{