From 7bf879c095903f860b040795939045bdbe4ee3fe Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 29 Nov 2020 14:05:23 +1000
Subject: [PATCH] Explicitly pass first Config through SingleInstanceController

---
 src/BizHawk.Client.EmuHawk/Program.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs
index 84e5336efe..6560a814c2 100644
--- a/src/BizHawk.Client.EmuHawk/Program.cs
+++ b/src/BizHawk.Client.EmuHawk/Program.cs
@@ -211,7 +211,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					try
 					{
-						InitAndRunSingleInstance(i => exitCode = i, args);
+						InitAndRunSingleInstance(GlobalWin.Config, i => exitCode = i, args);
 					}
 					catch (ObjectDisposedException)
 					{
@@ -324,12 +324,15 @@ namespace BizHawk.Client.EmuHawk
 
 		private class SingleInstanceController : WindowsFormsApplicationBase
 		{
+			private readonly Config _config;
+
 			private readonly Action<int> _setExitCode;
 
 			private readonly string[] cmdArgs;
 
-			public SingleInstanceController(Action<int> setExitCode, string[] args)
+			public SingleInstanceController(Config config, Action<int> setExitCode, string[] args)
 			{
+				_config = config;
 				_setExitCode = setExitCode;
 				cmdArgs = args;
 				IsSingleInstance = true;
@@ -346,7 +349,7 @@ namespace BizHawk.Client.EmuHawk
 
 			protected override void OnCreateMainForm()
 			{
-				MainForm = new MainForm(GlobalWin.Config, cmdArgs);
+				MainForm = new MainForm(_config, cmdArgs);
 				var title = MainForm.Text;
 				MainForm.Show();
 				MainForm.Text = title;
@@ -354,6 +357,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private static void InitAndRunSingleInstance(Action<int> setExitCode, string[] args) => new SingleInstanceController(setExitCode, args).Run();
+		private static void InitAndRunSingleInstance(Config config, Action<int> setExitCode, string[] args)
+			=> new SingleInstanceController(config, setExitCode, args).Run();
 	}
 }