From cdd5c7548841d5963ea9d0904cc836f357292f88 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 6 Jun 2020 14:57:37 -0500
Subject: [PATCH] Move FirmwareManager from Global to GlobalWin

---
 src/BizHawk.Client.Common/Global.cs                   |  1 -
 src/BizHawk.Client.EmuHawk/GlobalWin.cs               |  1 +
 src/BizHawk.Client.EmuHawk/MainForm.cs                | 10 +++++-----
 src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs  |  2 +-
 src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs       |  2 +-
 src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs       |  2 +-
 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs |  2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/BizHawk.Client.Common/Global.cs b/src/BizHawk.Client.Common/Global.cs
index b2361e7e86..e8ebaa7f44 100644
--- a/src/BizHawk.Client.Common/Global.cs
+++ b/src/BizHawk.Client.Common/Global.cs
@@ -6,7 +6,6 @@ namespace BizHawk.Client.Common
 	public static class Global
 	{
 		public static GameInfo Game { get; set; }
-		public static FirmwareManager FirmwareManager { get; set; }
 		public static IMovieSession MovieSession { get; set; }
 		public static InputManager InputManager { get; } = new InputManager();
 	}
diff --git a/src/BizHawk.Client.EmuHawk/GlobalWin.cs b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
index b34a8d6a9a..77cf7402c4 100644
--- a/src/BizHawk.Client.EmuHawk/GlobalWin.cs
+++ b/src/BizHawk.Client.EmuHawk/GlobalWin.cs
@@ -43,5 +43,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; }
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 38f090f26f..b4c4ca5911 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,
-				Global.FirmwareManager,
+				GlobalWin.FirmwareManager,
 				Config.PathEntries,
 				Config.FirmwareUserSpecifications);
 			var prefs = CoreComm.CorePreferencesFlags.None;
@@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
 			Rewinder = new Rewinder();
 
 			Global.InputManager.ControllerInputCoalescer = new ControllerInputCoalescer();
-			Global.FirmwareManager = new FirmwareManager();
+			GlobalWin.FirmwareManager = new FirmwareManager();
 			MovieSession = new MovieSession(
 				Config.Movies,
 				Config.PathEntries.MovieBackupsAbsolutePath(),
@@ -899,7 +899,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private Rewinder Rewinder { get; }
 
-		private FirmwareManager FirmwareManager => Global.FirmwareManager;
+		private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
 
 		protected override void OnActivated(EventArgs e)
 		{
@@ -3628,7 +3628,7 @@ namespace BizHawk.Client.EmuHawk
 					return false;
 				}
 
-				var loader = new RomLoader(Config, Global.FirmwareManager)
+				var loader = new RomLoader(Config, GlobalWin.FirmwareManager)
 				{
 					ChooseArchive = LoadArchiveChooser,
 					ChoosePlatform = ChoosePlatformForRom,
@@ -3636,7 +3636,7 @@ namespace BizHawk.Client.EmuHawk
 					MessageCallback = GlobalWin.OSD.AddMessage,
 					OpenAdvanced = args.OpenAdvanced
 				};
-				Global.FirmwareManager.RecentlyServed.Clear();
+				GlobalWin.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 6a514d46b4..7c05e3f386 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -243,7 +243,7 @@ namespace BizHawk.Client.EmuHawk
 			DoScan();
 		}
 
-		private FirmwareManager Manager => Global.FirmwareManager;
+		private FirmwareManager Manager => GlobalWin.FirmwareManager;
 
 		private void DoScan()
 		{
diff --git a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 879b0014de..c709e56824 100644
--- a/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -134,7 +134,7 @@ namespace BizHawk.Client.EmuHawk
 				movieToRecord.PopulateWithDefaultHeaderValues(
 					_emulator,
 					Global.Game,
-					Global.FirmwareManager,
+					GlobalWin.FirmwareManager,
 					AuthorBox.Text ?? _config.DefaultAuthor);
 				movieToRecord.Save();
 				_mainForm.StartNewMovie(movieToRecord, true);
diff --git a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
index 6874cc6063..db7ee96a7b 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
@@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
 			_files = new List<string>(files);
 			_numFrames = numFrames;
 
-			_ldr = new RomLoader(GlobalWin.Config, Global.FirmwareManager);
+			_ldr = new RomLoader(GlobalWin.Config, GlobalWin.FirmwareManager);
 			_ldr.OnLoadError += OnLoadError;
 			_ldr.ChooseArchive = ChooseArchive;
 			_comm = mainForm.CreateCoreComm();
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index b84fecd4ea..92af189c14 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -687,7 +687,7 @@ namespace BizHawk.Client.EmuHawk
 			tasMovie.PopulateWithDefaultHeaderValues(
 				Emulator,
 				Global.Game,
-				Global.FirmwareManager,
+				GlobalWin.FirmwareManager,
 				Config.DefaultAuthor);
 
 			SetTasMovieCallbacks(tasMovie);