diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index 2ad6908c8a..975c12fd4d 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -399,7 +399,7 @@ namespace BizHawk.Client.Common } catch (Exception e) { - if (e is MissingFirmwareException || e.InnerException is MissingFirmwareException) + if (_config.DontTryOtherCores || e is MissingFirmwareException || e.InnerException is MissingFirmwareException) throw; exceptions.Add(e); } diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 879802dafc..e84ee45d03 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -337,6 +337,8 @@ namespace BizHawk.Client.Common ["SGX"] = CoreNames.TurboNyma }; + public bool DontTryOtherCores { get; set; } + // ReSharper disable once UnusedMember.Global public string LastWrittenFrom { get; set; } = VersionInfo.MainVersion;