From fd30ddc15455c6c8337665ccfe45c7e3eb7db07c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 17 Dec 2019 14:15:09 -0600
Subject: [PATCH] Message config - use OSD in mainform not config

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs      |  5 ++++-
 BizHawk.Client.EmuHawk/config/MessageConfig.cs | 12 +++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 7b8e08d75e..037b5b5154 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -995,7 +995,10 @@ namespace BizHawk.Client.EmuHawk
 		private void MessagesMenuItem_Click(object sender, EventArgs e)
 		{
 			using var form = new MessageConfig();
-			form.ShowDialog();
+			var result = form.ShowDialog();
+			AddOnScreenMessage(result == DialogResult.OK
+				? "Message settings saved"
+				: "Message config aborted");
 		}
 
 		private void PathsMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/MessageConfig.cs b/BizHawk.Client.EmuHawk/config/MessageConfig.cs
index b391e9eb86..7dc063af71 100644
--- a/BizHawk.Client.EmuHawk/config/MessageConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/MessageConfig.cs
@@ -237,7 +237,11 @@ namespace BizHawk.Client.EmuHawk
 		private void Ok_Click(object sender, EventArgs e)
 		{
 			SaveSettings();
-			GlobalWin.OSD.AddMessage("Message settings saved");
+			Close();
+		}
+
+		private void Cancel_Click(object sender, EventArgs e)
+		{
 			Close();
 		}
 
@@ -260,12 +264,6 @@ namespace BizHawk.Client.EmuHawk
 			PositionPanel.Refresh();
 		}
 
-		private void Cancel_Click(object sender, EventArgs e)
-		{
-			GlobalWin.OSD.AddMessage("Message config aborted");
-			Close();
-		}
-
 		private void PositionPanel_MouseEnter(object sender, EventArgs e)
 		{
 			Cursor = Cursors.Hand;