From ab812ab0816d9c495de66b194c4af0479b793257 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 29 Dec 2019 14:16:44 -0600
Subject: [PATCH] pass in mainform to log window stuff

---
 BizHawk.Client.EmuHawk/LogConsole.cs      |  4 ++--
 BizHawk.Client.EmuHawk/LogWindow.cs       | 12 +++++++-----
 BizHawk.Client.EmuHawk/MainForm.Events.cs |  2 +-
 BizHawk.Client.EmuHawk/MainForm.cs        |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/LogConsole.cs b/BizHawk.Client.EmuHawk/LogConsole.cs
index b1f4a4f43a..16299af22f 100644
--- a/BizHawk.Client.EmuHawk/LogConsole.cs
+++ b/BizHawk.Client.EmuHawk/LogConsole.cs
@@ -226,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public static void ShowConsole()
+		public static void ShowConsole(MainForm parent)
 		{
 			if (ConsoleVisible) return;
 			ConsoleVisible = true;
@@ -241,7 +241,7 @@ namespace BizHawk.Client.EmuHawk
 				_logStream = new LogStream();
 				Log.HACK_LOG_STREAM = _logStream;
 				Console.SetOut(new StreamWriter(_logStream) { AutoFlush = true });
-				_window = new LogWindow();
+				_window = new LogWindow(parent);
 				_window.Show();
 				_logStream.Emit = str => { _window.Append(str); };
 			}
diff --git a/BizHawk.Client.EmuHawk/LogWindow.cs b/BizHawk.Client.EmuHawk/LogWindow.cs
index 294f1f3fb2..b2996fd0de 100644
--- a/BizHawk.Client.EmuHawk/LogWindow.cs
+++ b/BizHawk.Client.EmuHawk/LogWindow.cs
@@ -18,23 +18,25 @@ namespace BizHawk.Client.EmuHawk
 		//TODO: only show add to game db when this is a Rom details dialog
 		//Let user decide what type (instead of always adding it as a good dump)
 		private readonly List<string> _lines = new List<string>();
+		private readonly MainForm _mainForm;
 
-		public LogWindow()
+		public LogWindow(MainForm mainForm)
 		{
+			_mainForm = mainForm;
 			InitializeComponent();
 			Closing += (o, e) =>
 			{
 				Global.Config.ShowLogWindow = false;
-				GlobalWin.MainForm.NotifyLogWindowClosing();
+				mainForm.NotifyLogWindowClosing();
 				LogConsole.NotifyLogWindowClosing();
 				SaveConfigSettings();
 			};
 			ListView_ClientSizeChanged(null, null);
 		}
 
-		public static void ShowReport(string title, string report, IWin32Window parent)
+		public static void ShowReport(string title, string report, MainForm parent)
 		{
-			using var dlg = new LogWindow();
+			using var dlg = new LogWindow(parent);
 			var ss = report.Split('\n');
 			foreach (var s in ss)
 			{
@@ -151,7 +153,7 @@ namespace BizHawk.Client.EmuHawk
 				var userDb = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb_user.txt");
 				Global.Game.Status = gameDbEntry.Status = picker.PickedStatus;
 				Database.SaveDatabaseEntry(userDb, gameDbEntry);
-				GlobalWin.MainForm.UpdateDumpIcon();
+				_mainForm.UpdateDumpIcon();
 				HideShowGameDbButton();
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index f4fa6c6002..98f594f7c8 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -851,7 +851,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (Config.ShowLogWindow)
 			{
-				LogConsole.ShowConsole();
+				LogConsole.ShowConsole(this);
 			}
 			else
 			{
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 5162343ea3..b69119c835 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -225,7 +225,7 @@ namespace BizHawk.Client.EmuHawk
 			Game = GameInfo.NullInstance;
 			if (Config.ShowLogWindow && !OSTailoredCode.IsUnixHost)
 			{
-				LogConsole.ShowConsole();
+				LogConsole.ShowConsole(this);
 				DisplayLogWindowMenuItem.Checked = true;
 			}