From 39c0011d09d80098c08f7a7dee5e3fefc9fcc174 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Tue, 12 Jan 2021 09:32:58 -0500 Subject: [PATCH] Move around some error messages See #2561. From the point of view of romloader, this is all pretty simple: It asks for a particular settings type. It should either get null back (indicating there was nothing, use defaults), or an object of that type. Providing a completely unrelated type is baloney. So this check here is a stupid defensive check that shouldn't be needed. MainForm cannot be trusted. --- src/BizHawk.Client.Common/RomLoader.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index 939158a8a7..95d751df9d 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -84,14 +84,22 @@ namespace BizHawk.Client.Common private object GetCoreSettings(Type t, Type settingsType) { var e = new SettingsLoadArgs(t, settingsType); - OnLoadSettings?.Invoke(this, e); + if (OnLoadSettings == null) + throw new InvalidOperationException("Frontend failed to provide a settings getter"); + OnLoadSettings(this, e); + if (e.Settings != null && e.Settings.GetType() != settingsType) + throw new InvalidOperationException($"Frontend did not provide the requested settings type: Expected {settingsType}, got {e.Settings.GetType()}"); return e.Settings; } private object GetCoreSyncSettings(Type t, Type syncSettingsType) { var e = new SettingsLoadArgs(t, syncSettingsType); - OnLoadSyncSettings?.Invoke(this, e); + if (OnLoadSyncSettings == null) + throw new InvalidOperationException("Frontend failed to provide a sync settings getter"); + OnLoadSyncSettings(this, e); + if (e.Settings != null && e.Settings.GetType() != syncSettingsType) + throw new InvalidOperationException($"Frontend did not provide the requested sync settings type: Expected {syncSettingsType}, got {e.Settings.GetType()}"); return e.Settings; }