From bd413738a1d32660839f5f0a46b8c003c7c688d0 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Sat, 11 Jul 2020 13:56:43 -0400 Subject: [PATCH] Fix nyma core bug with layer settings If you tried to load a nyma core with any of your layers disabled, you would crash --- src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs index c6e4397db4..6c89ffa0c1 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs @@ -56,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Waterbox var portData = GetInputPortsData(); InitAllSettingsInfo(portData); _nyma.SetFrontendSettingQuery(_settingsQueryDelegate); - _settings.Normalize(SettingsInfo); - _syncSettings.Normalize(SettingsInfo); var filesToRemove = new List(); if (firmwares != null) @@ -154,11 +152,10 @@ namespace BizHawk.Emulation.Cores.Waterbox _soundBuffer = new short[22050 * 2]; InitControls(portData, discs?.Length > 0, ref info); - _nyma.SetFrontendSettingQuery(null); - if (_disks != null) - _nyma.SetCDCallbacks(null, null); PostInit(); SettingsInfo.LayerNames = GetLayerData(); + _settings.Normalize(SettingsInfo); + _syncSettings.Normalize(SettingsInfo); _nyma.SetFrontendSettingQuery(_settingsQueryDelegate); if (_disks != null) _nyma.SetCDCallbacks(_cdTocCallback, _cdSectorCallback);