diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 60f7cbab07..325f737f92 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1335,7 +1335,7 @@ namespace BizHawk.Client.EmuHawk private void LoadConfigMenuItem_Click(object sender, EventArgs e) { - Global.Config = ConfigService.Load(PathManager.DefaultIniPath); + Config = ConfigService.Load(PathManager.DefaultIniPath); Config.ResolveDefaults(); InitControls(); // rebind hotkeys AddOnScreenMessage($"Config file loaded: {PathManager.DefaultIniPath}"); @@ -1353,7 +1353,7 @@ namespace BizHawk.Client.EmuHawk if (ofd.ShowHawkDialog().IsOk()) { - Global.Config = ConfigService.Load(ofd.FileName); + Config = ConfigService.Load(ofd.FileName); Config.ResolveDefaults(); InitControls(); // rebind hotkeys AddOnScreenMessage($"Config file loaded: {ofd.FileName}"); diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 103e5f8757..7abbe3b29a 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -800,7 +800,12 @@ namespace BizHawk.Client.EmuHawk private ISoundProvider _currentSoundProvider = new NullSound(44100 / 60); // Reasonable default until we have a core instance - private Config Config => Global.Config; + private Config Config + { + get => Global.Config; + set => Global.Config = value; + } + private ToolManager Tools => GlobalWin.Tools; private DisplayManager DisplayManager => GlobalWin.DisplayManager; private IMovieSession MovieSession => Global.MovieSession;