From f7a7b722c58263de52b222fb2e9e9bad5ec41482 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 29 Nov 2020 19:06:45 +1000
Subject: [PATCH] Pass globals to ExternalToolManager via ctor and Restart
 method

---
 src/BizHawk.Client.EmuHawk/MainForm.cs           |  4 ++--
 .../tools/ExternalToolManager.cs                 | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 8d46d2ddb1..4d726e1972 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -344,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
 			Controls.SetChildIndex(_presentationPanel, 0);
 
 			Tools = new ToolManager(this, Config, DisplayManager, InputManager, Emulator, MovieSession, Game);
-			ExtToolManager = new ExternalToolManager();
+			ExtToolManager = new ExternalToolManager(Config.PathEntries, () => (EmuClientApi.SystemIdConverter.Convert(Emulator.SystemId), Game.Hash));
 
 			// TODO GL - move these event handlers somewhere less obnoxious line in the On* overrides
 			Load += (o, e) =>
@@ -2793,7 +2793,7 @@ namespace BizHawk.Client.EmuHawk
 			InitControls(); // rebind hotkeys
 			InputManager.SyncControls(Emulator, MovieSession, Config);
 			Tools.Restart(Config, Emulator, Game);
-			ExtToolManager.Restart();
+			ExtToolManager.Restart(Config.PathEntries);
 			AddOnScreenMessage($"Config file loaded: {iniPath}");
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
index f67513a26c..2397e3d090 100644
--- a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
@@ -13,20 +13,26 @@ namespace BizHawk.Client.EmuHawk
 {
 	public sealed class ExternalToolManager
 	{
+		private readonly Func<(CoreSystem System, string Hash)> _getLoadedRomInfoCallback;
+
 		private FileSystemWatcher DirectoryMonitor;
 
 		private readonly List<ToolStripMenuItem> MenuItems = new List<ToolStripMenuItem>();
 
-		public ExternalToolManager() => Restart();
+		public ExternalToolManager(PathEntryCollection paths, Func<(CoreSystem System, string Hash)> getLoadedRomInfoCallback)
+		{
+			_getLoadedRomInfoCallback = getLoadedRomInfoCallback;
+			Restart(paths);
+		}
 
-		public void Restart()
+		public void Restart(PathEntryCollection paths)
 		{
 			if (DirectoryMonitor != null)
 			{
 				DirectoryMonitor.Created -= DirectoryMonitor_Created;
 				DirectoryMonitor.Dispose();
 			}
-			var extToolsDir = GlobalWin.Config.PathEntries["Global", "External Tools"].Path;
+			var extToolsDir = paths["Global", "External Tools"].Path;
 			if (!Directory.Exists(extToolsDir)) Directory.CreateDirectory(extToolsDir);
 			DirectoryMonitor = new FileSystemWatcher(extToolsDir, "*.dll")
 			{
@@ -91,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
 				item.Tag = (externalToolFile.Location, entryPoint.FullName); // Tag set => no errors (show custom icon even when disabled)
 				if (applicabilityAttrs.Count == 1)
 				{
-					var system = EmuClientApi.SystemIdConverter.Convert(GlobalWin.Emulator.SystemId);
+					var (system, loadedRomHash) = _getLoadedRomInfoCallback();
 					if (applicabilityAttrs[0].NotApplicableTo(system))
 					{
 						item.ToolTipText = system == CoreSystem.Null
@@ -99,7 +105,7 @@ namespace BizHawk.Client.EmuHawk
 							: "This tool doesn't work with this system";
 						return item;
 					}
-					if (applicabilityAttrs[0].NotApplicableTo(GlobalWin.Game.Hash, system))
+					if (applicabilityAttrs[0].NotApplicableTo(loadedRomHash, system))
 					{
 						item.ToolTipText = "This tool doesn't work with this game";
 						return item;