From 1bea591e31c1be83edcbdfd04220a983efeaf942 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 17 Dec 2019 09:53:19 -0600 Subject: [PATCH] GenericCoreConfig - use passed in mainform instead of global --- .../config/GenericCoreConfig.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs index d795f4fa78..d4c6b63e13 100644 --- a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs +++ b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs @@ -9,18 +9,15 @@ namespace BizHawk.Client.EmuHawk { public partial class GenericCoreConfig : Form { + private readonly MainForm _mainForm; private object _s; private object _ss; private bool _syncSettingsChanged; private bool _settingsChanged; - private GenericCoreConfig() - : this(false, false) - { - } - - private GenericCoreConfig(bool ignoreSettings, bool ignoreSyncSettings) + private GenericCoreConfig(MainForm mainForm, bool ignoreSettings = false, bool ignoreSyncSettings = false) { + _mainForm = mainForm; InitializeComponent(); var settable = new SettingsAdapter(Global.Emulator); @@ -97,27 +94,27 @@ namespace BizHawk.Client.EmuHawk { if (_s != null && _settingsChanged) { - GlobalWin.MainForm.PutCoreSettings(_s); + _mainForm.PutCoreSettings(_s); } if (_ss != null && _syncSettingsChanged) { - GlobalWin.MainForm.PutCoreSyncSettings(_ss); + _mainForm.PutCoreSyncSettings(_ss); } DialogResult = DialogResult.OK; Close(); } - public static void DoDialog(IWin32Window owner, string title) + public static void DoDialog(MainForm owner, string title) { - using var dlg = new GenericCoreConfig { Text = title }; + using var dlg = new GenericCoreConfig(owner) { Text = title }; dlg.ShowDialog(owner); } - public static void DoDialog(IWin32Window owner, string title, bool hideSettings, bool hideSyncSettings) + public static void DoDialog(MainForm owner, string title, bool hideSettings, bool hideSyncSettings) { - using var dlg = new GenericCoreConfig(hideSettings, hideSyncSettings) { Text = title }; + using var dlg = new GenericCoreConfig(owner, hideSettings, hideSyncSettings) { Text = title }; dlg.ShowDialog(owner); }