From eb438fd9cb373904fe67ffe17aa2e2619adb748a Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 31 Dec 2019 17:06:40 -0600
Subject: [PATCH] pass in mainform to Keyboard.cs instead of using global

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

diff --git a/BizHawk.Client.EmuHawk/Input/Input.cs b/BizHawk.Client.EmuHawk/Input/Input.cs
index 0f4b3aa3c0..9af1d72d24 100644
--- a/BizHawk.Client.EmuHawk/Input/Input.cs
+++ b/BizHawk.Client.EmuHawk/Input/Input.cs
@@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk
 			UpdateThread.Start();
 		}
 
-		public static void Initialize()
+		public static void Initialize(Control parent)
 		{
 			if (OSTailoredCode.IsUnixHost)
 			{
@@ -136,7 +136,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				KeyInput.Initialize();
+				KeyInput.Initialize(parent);
 				IPCKeyInput.Initialize();
 				GamePad.Initialize();
 				GamePad360.Initialize();
diff --git a/BizHawk.Client.EmuHawk/Input/Keyboard.cs b/BizHawk.Client.EmuHawk/Input/Keyboard.cs
index de6b6c6c5e..0306791686 100644
--- a/BizHawk.Client.EmuHawk/Input/Keyboard.cs
+++ b/BizHawk.Client.EmuHawk/Input/Keyboard.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Windows.Forms;
 using SlimDX;
 using SlimDX.DirectInput;
 
@@ -11,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
 		private static DirectInput _directInput;
 		private static Keyboard _keyboard;
 
-		public static void Initialize()
+		public static void Initialize(Control parent)
 		{
 			lock (SyncObj)
 			{
@@ -20,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
 				_directInput = new DirectInput();
 
 				_keyboard = new Keyboard(_directInput);
-				_keyboard.SetCooperativeLevel(GlobalWin.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
+				_keyboard.SetCooperativeLevel(parent.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
 				_keyboard.Properties.BufferSize = 8;
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index b2264ba4db..391c57e4e6 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -325,7 +325,7 @@ namespace BizHawk.Client.EmuHawk
 				Sound?.StartSound();
 			};
 
-			Input.Initialize();
+			Input.Initialize(this);
 			InitControls();
 
 			CoreFileProvider.SyncCoreCommInputSignals(comm);