From 707dae93a710fc63f9e4e61282f5b4b8780adbea Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 26 Nov 2020 22:55:08 +1000
Subject: [PATCH] Use MainForm's prop to get the global ToolManager in
 Win32LuaLibraries

---
 src/BizHawk.Client.EmuHawk/GlobalWin.cs                   | 2 --
 src/BizHawk.Client.EmuHawk/MainForm.cs                    | 4 ++--
 src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/GlobalWin.cs b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
index ea767d9126..2d23143fc8 100644
--- a/src/BizHawk.Client.EmuHawk/GlobalWin.cs
+++ b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
@@ -8,8 +8,6 @@ namespace BizHawk.Client.EmuHawk
 {
 	public static class GlobalWin
 	{
-		public static ToolManager Tools;
-
 		public static IEmulator Emulator { get; set; }
 
 		/// <summary>
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index c5af77a222..a4c3513753 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -311,7 +311,7 @@ namespace BizHawk.Client.EmuHawk
 			GlobalWin.Game = GameInfo.NullInstance;
 			_throttle = new Throttle();
 			Emulator = new NullEmulator();
-			GlobalWin.Tools = Tools = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
+			Tools = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
 
 			UpdateStatusSlots();
 			UpdateKeyPriorityIcon();
@@ -847,7 +847,7 @@ namespace BizHawk.Client.EmuHawk
 			set => GlobalWin.Config = base.Config = value;
 		}
 
-		private readonly ToolManager Tools;
+		public readonly ToolManager Tools;
 
 		private DisplayManager DisplayManager => GlobalWin.DisplayManager;
 
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
index e613493233..d1ca858e05 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
@@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public Win32LuaLibraries(
 			IEmulatorServiceProvider serviceProvider,
-			IMainFormForApi mainForm,
+			MainForm mainForm,
 			DisplayManager displayManager,
 			InputManager inputManager,
 			Config config,
@@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk
 
 			LuaWait = new AutoResetEvent(false);
 			Docs.Clear();
-			var apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, mainForm, displayManager, inputManager, GlobalWin.Tools, config, emulator, game);
+			var apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, mainForm, displayManager, inputManager, mainForm.Tools, config, emulator, game);
 
 			// Register lua libraries
 			foreach (var lib in Client.Common.ReflectionCache.Types.Concat(EmuHawk.ReflectionCache.Types)
@@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else if (instance is ConsoleLuaLibrary consoleLib)
 					{
-						consoleLib.Tools = GlobalWin.Tools;
+						consoleLib.Tools = mainForm.Tools;
 						_logToLuaConsoleCallback = consoleLib.Log;
 					}
 					else if (instance is GuiLuaLibrary guiLib)
@@ -89,7 +89,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else if (instance is TAStudioLuaLibrary tastudioLib)
 					{
-						tastudioLib.Tools = GlobalWin.Tools;
+						tastudioLib.Tools = mainForm.Tools;
 					}
 
 					if (instance is DelegatingLuaLibrary dlgInstance) dlgInstance.APIs = apiContainer;