Fix nyma core bug with layer settings

If you tried to load a nyma core with any of your layers disabled, you would crash
This commit is contained in:
nattthebear 2020-07-11 13:56:43 -04:00
parent 0578443338
commit bd413738a1
1 changed files with 2 additions and 5 deletions

View File

@ -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<string>();
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);