ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use MainForm.thing instead of GlobalWin.thing in some places, this is marginally better, maybe

This commit is contained in:
adelikat 2020-06-25 08:52:53 -05:00
parent 49cb426a59
commit 371a7bd4f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
View File

@ -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