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

try to load a different core if an autodetected mame rom ends up failing to load

This commit is contained in:
CasualPokePlayer 2022-11-21 18:25:18 -08:00
parent 5a4dc9fd88
commit 248e87b6d1
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,6 +585,28 @@ namespace BizHawk.Client.Common
}
}
private void LoadMAME(string path, CoreComm nextComm, HawkFile file, out IEmulator nextEmulator, out RomGame rom, out GameInfo game, out bool cancel)
{
try
{
LoadOther(nextComm, file, null, out nextEmulator, out rom, out game, out cancel);
}
catch (Exception mex) // ok, MAME threw, let's try another core...
{
try
{
using var f = new HawkFile(path, allowArchives: true);
if (!HandleArchiveBinding(f)) throw;
LoadOther(nextComm, f, null, out nextEmulator, out rom, out game, out cancel);
}
catch (Exception oex)
{
if (mex == oex) throw mex;
throw new AggregateException(mex, oex);
}
}
}
public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, string forcedCoreName = null, int recursiveCount = 0)
{
if (path == null) return false;
@ -687,6 +709,10 @@ namespace BizHawk.Client.Common
case ".minipsf":
LoadPSF(path, nextComm, file, out nextEmulator, out rom, out game);
break;
case ".zip" when forcedCoreName is null:
case ".7z" when forcedCoreName is null:
LoadMAME(path, nextComm, file, out nextEmulator, out rom, out game, out cancel);
break;
default:
if (Disc.IsValidExtension(ext))
{