From 248e87b6d1676258d925214d8a4b09f3b9891670 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Mon, 21 Nov 2022 18:25:18 -0800
Subject: [PATCH] try to load a different core if an autodetected mame rom ends
 up failing to load

---
 src/BizHawk.Client.Common/RomLoader.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 8d720fce0c..37ee23e383 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -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))
 							{