From 371a7bd4f3d9077146e03f96ed0071ca432b8d1d Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 25 Jun 2020 08:52:53 -0500 Subject: [PATCH] use MainForm.thing instead of GlobalWin.thing in some places, this is marginally better, maybe --- src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs b/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs index 56cf5c6023..4789eaecdf 100644 --- a/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs @@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); _mainForm = mainForm; - var settable = new SettingsAdapter(GlobalWin.Emulator); + var settable = new SettingsAdapter(_mainForm.Emulator); if (settable.HasSettings && !ignoreSettings) { @@ -52,7 +52,7 @@ namespace BizHawk.Client.EmuHawk tabControl1.TabPages.Remove(tabPage2); } - if (GlobalWin.MovieSession.Movie.IsActive()) + if (_mainForm.MovieSession.Movie.IsActive()) { propertyGrid2.Enabled = false; // disable changes to sync setting when movie, so as not to confuse user } @@ -108,7 +108,7 @@ namespace BizHawk.Client.EmuHawk public static void DoDialog(MainForm owner, string title) { - if (GlobalWin.Emulator is Emulation.Cores.Waterbox.NymaCore core) + if (owner.Emulator is Emulation.Cores.Waterbox.NymaCore core) { var desc = new Emulation.Cores.Waterbox.NymaTypeDescriptorProvider(core.SettingsInfo); try