From 4a509fa410e2b3bc923670a4141844aea9f262fb Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 16 Dec 2019 17:44:18 -0600
Subject: [PATCH] pass in dependencies to SMS graphics config dialog

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs     |  7 ++++--
 .../config/SMS/SMSGraphicsConfig.Designer.cs  |  4 ++--
 .../config/SMS/SMSGraphicsConfig.cs           | 24 ++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 2c4db6d01a..09974b9fce 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1937,8 +1937,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SMSGraphicsSettingsMenuItem_Click(object sender, EventArgs e)
 		{
-			using var form = new SMSGraphicsConfig();
-			form.ShowDialog();
+			if (Emulator is SMS sms)
+			{
+				using var form = new SmsGraphicsConfig(this, sms.GetSettings().Clone());
+				form.ShowDialog();
+			}
 		}
 
 		private void GGGameGenieMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs
index 290f0f56ad..71045e9419 100644
--- a/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.Designer.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Client.EmuHawk
 {
-	partial class SMSGraphicsConfig
+	partial class SmsGraphicsConfig
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -105,7 +105,7 @@
             this.Controls.Add(this.OK);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "SMSGraphicsConfig";
+            this.Name = "SmsGraphicsConfig";
             this.ShowIcon = false;
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
diff --git a/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs
index 06b7c70414..819b4ecfba 100644
--- a/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/SMS/SMSGraphicsConfig.cs
@@ -1,31 +1,33 @@
 using System;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Sega.MasterSystem;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class SMSGraphicsConfig : Form
+	public partial class SmsGraphicsConfig : Form
 	{
-		public SMSGraphicsConfig()
+		private readonly MainForm _mainForm;
+		private readonly SMS.SMSSettings _settings;
+		public SmsGraphicsConfig(
+			MainForm mainForm,
+			SMS.SMSSettings settings)
 		{
+			_mainForm = mainForm;
+			_settings = settings;
 			InitializeComponent();
 		}
 
 		private void SMSGraphicsConfig_Load(object sender, EventArgs e)
 		{
-			var s = ((SMS)Global.Emulator).GetSettings();
-			DispOBJ.Checked = s.DispOBJ;
-			DispBG.Checked = s.DispBG;
+			DispOBJ.Checked = _settings.DispOBJ;
+			DispBG.Checked = _settings.DispBG;
 		}
 
 		private void Ok_Click(object sender, EventArgs e)
 		{
-			var s = ((SMS)Global.Emulator).GetSettings();
-			s.DispOBJ = DispOBJ.Checked;
-			s.DispBG = DispBG.Checked;
-			GlobalWin.MainForm.PutCoreSettings(s);
+			_settings.DispOBJ = DispOBJ.Checked;
+			_settings.DispBG = DispBG.Checked;
+			_mainForm.PutCoreSettings(_settings);
 			Close();
 		}
 	}