From e6858c702bedbdd0652d0d4ee9b96bb7f85db8e4 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Sat, 20 Jun 2020 12:12:34 -0400 Subject: [PATCH] nyma - fix bug that stopped NGP from booting Happened in a recent refactoring. NGP hides the constantfb setting (Because it is always at a constant fb), and that needs to override the core provision, not cause an exception. --- src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs index f2476c5dd1..975785ab84 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs @@ -285,7 +285,10 @@ namespace BizHawk.Emulation.Cores.Waterbox }); } - s.AllOverrides = SettingOverrides.Concat(ExtraOverrides).ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + foreach (var kvp in ExtraOverrides.Concat(SettingOverrides)) + { + s.AllOverrides[kvp.Key] = kvp.Value; + } foreach (var setting in GetSettingsData().Concat(ExtraSettings)) { s.AllSettingsByKey.Add(setting.SettingsKey, setting);