ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't open choose file from archive dialog when trying to fallback to a different core for a MAME ROM 

The fallback is intended in cases where there is a misdetection for MAME ROMs, since it just goes off the archive's filename against a db. MAME ROMs will not have any sensical ROM extensions in them, and will most likely just have multiple files in it. As such, if this is actually a MAME ROM, they're pretty much guaranteed to show the choose file in archive dialog, which would confuse users. If it's not a MAME ROM, it most likely will not show this dialog and will just be loaded by the appropriate core (of course in practice this likely doesn't occur anyways, since most users likely just have their ROMs named with dat names like No-Intro etc which never match MAME's names).
This commit is contained in:
CasualPokePlayer 2024-12-11 19:33:33 -08:00
parent b8ec340c90
commit c5c8b6bdd9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -194,7 +194,7 @@ namespace BizHawk.Client.Common
public IOpenAdvanced OpenAdvanced { get; set; }
private bool HandleArchiveBinding(HawkFile file)
private bool HandleArchiveBinding(HawkFile file, bool showDialog = true)
{
// try binding normal rom extensions first
if (!file.IsBound)
@ -213,7 +213,7 @@ namespace BizHawk.Client.Common
// if we have an archive and need to bind something, then pop the dialog
if (file.IsArchive && !file.IsBound)
{
int? result = HandleArchive(file);
var result = showDialog ? HandleArchive(file) : null;
if (result.HasValue)
{
file.BindArchiveMember(result.Value);
@ -627,7 +627,10 @@ namespace BizHawk.Client.Common
try
{
using var f = new HawkFile(path, allowArchives: true);
if (!HandleArchiveBinding(f)) throw;
// we want to avoid opening up the choose file from archive dialog
// as it is very likely in this case this is actually a MAME ROM
// which case, we do want the error to be shown immediately, other cores won't load this
if (!HandleArchiveBinding(f, showDialog: false)) throw;
LoadOther(nextComm, f, ext: ext, forcedCoreName: null, out nextEmulator, out rom, out game, out cancel);
}
catch (Exception oex)