From 79d06bcb4ac612f398dab5cf5f02a44471e8672b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 2 Dec 2019 17:19:58 -0600
Subject: [PATCH] Fix LoadRamWatch logic, was always attempting to load it even
 when it was already loaded.  Worse was that it was autoloading watch files
 anytime something interacted with it like the "add to ram watch" feature in
 ram search

---
 BizHawk.Client.EmuHawk/tools/ToolManager.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index fd4fad5d2d..f729f19e5c 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -819,11 +819,13 @@ namespace BizHawk.Client.EmuHawk
 
 		public void LoadRamWatch(bool loadDialog)
 		{
-			if (!IsLoaded<RamWatch>())
+			if (IsLoaded<RamWatch>())
 			{
-				Load<RamWatch>();
+				return;
 			}
 
+			Load<RamWatch>();
+
 			if (IsAvailable<RamWatch>()) // Just because we attempted to load it, doesn't mean it was, the current core may not have the correct dependencies
 			{
 				if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty)