From 808ec64dbad74ea619e2fb00ba23d1e578dce5c7 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 26 Nov 2020 15:08:15 +1000
Subject: [PATCH] Replace GlobalWin.FirmwareManager with MainForm prop

---
 src/BizHawk.Client.EmuHawk/GlobalWin.cs                | 1 -
 src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToConfig.cs | 3 +++
 src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToTools.cs  | 3 +++
 src/BizHawk.Client.EmuHawk/MainForm.cs                 | 8 ++++----
 src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs   | 2 +-
 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs  | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/GlobalWin.cs b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
index 1674cdbbca..ef4f4976a9 100644
--- a/src/BizHawk.Client.EmuHawk/GlobalWin.cs
+++ b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
@@ -37,7 +37,6 @@ namespace BizHawk.Client.EmuHawk
 		public static Dictionary<string, object> UserBag { get; set; } = new Dictionary<string, object>();
 
 		public static Config Config { get; set; }
-		public static FirmwareManager FirmwareManager { get; set; }
 		public static GameInfo Game { get; set; }
 		public static IMovieSession MovieSession { get; set; }
 		public static InputManager InputManager { get; } = new InputManager();
diff --git a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToConfig.cs b/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToConfig.cs
index 38c8035b9b..41bd4edc1b 100644
--- a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToConfig.cs
@@ -10,6 +10,9 @@ namespace BizHawk.Client.EmuHawk
 		/// <remarks>only referenced from <see cref="GenericCoreConfig"/></remarks>
 		IEmulator Emulator { get; }
 
+		/// <remarks>only referenced from <see cref="FirmwaresConfig"/></remarks>
+		FirmwareManager FirmwareManager { get; }
+
 		IMovieSession MovieSession { get; }
 
 		void AddOnScreenMessage(string message);
diff --git a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToTools.cs b/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToTools.cs
index 124fb3273e..ca311cd584 100644
--- a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToTools.cs
+++ b/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToTools.cs
@@ -18,6 +18,9 @@ namespace BizHawk.Client.EmuHawk
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
 		bool EmulatorPaused { get; }
 
+		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
+		FirmwareManager FirmwareManager { get; }
+
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
 		bool GameIsClosing { get; }
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 9d55917efb..42bb8bb828 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -162,7 +162,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var cfp = new CoreFileProvider(
 				ShowMessageCoreComm,
-				GlobalWin.FirmwareManager,
+				FirmwareManager,
 				Config.PathEntries,
 				Config.FirmwareUserSpecifications);
 			var prefs = CoreComm.CorePreferencesFlags.None;
@@ -282,7 +282,7 @@ namespace BizHawk.Client.EmuHawk
 			base.Config = Config;
 
 			InputManager.ControllerInputCoalescer = new ControllerInputCoalescer();
-			GlobalWin.FirmwareManager = new FirmwareManager();
+			FirmwareManager = new FirmwareManager();
 			MovieSession = new MovieSession(
 				Config.Movies,
 				Config.PathEntries.MovieBackupsAbsolutePath(),
@@ -874,7 +874,7 @@ namespace BizHawk.Client.EmuHawk
 			AddOnScreenMessage(Rewinder?.Active == true ? "Rewind started" : "Rewind disabled");
 		}
 
-		private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
+		public FirmwareManager FirmwareManager { get; }
 
 		protected override void OnActivated(EventArgs e)
 		{
@@ -3558,7 +3558,7 @@ namespace BizHawk.Client.EmuHawk
 					MessageCallback = OSD.AddMessage,
 					OpenAdvanced = args.OpenAdvanced
 				};
-				GlobalWin.FirmwareManager.RecentlyServed.Clear();
+				FirmwareManager.RecentlyServed.Clear();
 
 				loader.OnLoadError += ShowLoadError;
 				loader.OnLoadSettings += CoreSettings;
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index d7398edd9f..6dd0f64692 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -252,7 +252,7 @@ namespace BizHawk.Client.EmuHawk
 			DoScan();
 		}
 
-		private FirmwareManager Manager => GlobalWin.FirmwareManager;
+		private FirmwareManager Manager => _mainForm.FirmwareManager;
 
 		private void DoScan()
 		{
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 363014de55..0b20544d90 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -618,7 +618,7 @@ namespace BizHawk.Client.EmuHawk
 			tasMovie.PopulateWithDefaultHeaderValues(
 				Emulator,
 				Game,
-				GlobalWin.FirmwareManager,
+				MainForm.FirmwareManager,
 				Config.DefaultAuthor);
 
 			SetTasMovieCallbacks(tasMovie);