From 4ac7e8e36ac6283fa2d3067fdf3b4e86b537b3e1 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 17 Dec 2019 14:30:31 -0600
Subject: [PATCH] Rewind config - move osd messages to calling code

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs     | 5 ++++-
 BizHawk.Client.EmuHawk/config/RewindConfig.cs | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index e84f015a91..08f535150d 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1025,7 +1025,10 @@ namespace BizHawk.Client.EmuHawk
 		private void RewindOptionsMenuItem_Click(object sender, EventArgs e)
 		{
 			using var form = new RewindConfig();
-			form.ShowDialog();
+			AddOnScreenMessage(form.ShowDialog().IsOk()
+				? "Rewind and State settings saved"
+				: "Rewind config aborted");
+
 		}
 
 		private void FileExtensionsMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/RewindConfig.cs b/BizHawk.Client.EmuHawk/config/RewindConfig.cs
index 078e4d3f84..5ff4f7a8a9 100644
--- a/BizHawk.Client.EmuHawk/config/RewindConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/RewindConfig.cs
@@ -137,7 +137,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void Cancel_Click(object sender, EventArgs e)
 		{
-			GlobalWin.OSD.AddMessage("Rewind config aborted");
 			Close();
 		}
 
@@ -185,7 +184,6 @@ namespace BizHawk.Client.EmuHawk
 			Global.Config.NoLowResLargeScreenshotWithStates = !LowResLargeScreenshotsCheckbox.Checked;
 			Global.Config.BigScreenshotSize = (int)BigScreenshotNumeric.Value * 1024;
 
-			GlobalWin.OSD.AddMessage("Rewind and State settings saved");
 			Close();
 		}