From 2e428ccc2e2b577aab7ae4bf68519d6474b50d87 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 26 Nov 2020 21:46:41 +1000
Subject: [PATCH] Clean up GlobalWin.Tools assignment and usage in MainForm

---
 src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs | 2 +-
 src/BizHawk.Client.EmuHawk/MainForm.cs            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs b/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs
index 5b9b666f0e..2577cc5d41 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs
@@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			if (GlobalWin.Tools.IsLoaded<TAStudio>())
+			if (Tools.IsLoaded<TAStudio>())
 			{
 				Tools.TAStudio.LoadMovieFile(filename);
 			}
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 03f1939596..c5af77a222 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 = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
+			GlobalWin.Tools = Tools = new ToolManager(this, Config, InputManager, Emulator, MovieSession, Game);
 
 			UpdateStatusSlots();
 			UpdateKeyPriorityIcon();
@@ -847,7 +847,8 @@ namespace BizHawk.Client.EmuHawk
 			set => GlobalWin.Config = base.Config = value;
 		}
 
-		private ToolManager Tools => GlobalWin.Tools;
+		private readonly ToolManager Tools;
+
 		private DisplayManager DisplayManager => GlobalWin.DisplayManager;
 
 		public IMovieSession MovieSession