Set game name for Libretro when available

resolves #4144
TASEmulators · Jan 5, 2025 · d9da3cf · d9da3cf
1 parent 407c26e
commit d9da3cf
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
@@ -302,9 +302,14 @@ Exception NoCoreForSystem(string sysID)
 			return game;
 		}
 
+		private Disc/*?*/ InstantiateDiscFor(string path)
+			=> DiscExtensions.CreateAnyType(
+				path,
+				str => DoLoadErrorCallback(message: str, systemId: "???"/*TODO we should NOT be doing this, even if it's just for error display*/, LoadErrorType.DiscError));
+
 		private bool LoadDisc(string path, CoreComm nextComm, HawkFile file, string ext, string forcedCoreName, out IEmulator nextEmulator, out GameInfo game)
 		{
-			var disc = DiscExtensions.CreateAnyType(path, str => DoLoadErrorCallback(str, "???", LoadErrorType.DiscError));
+			var disc = InstantiateDiscFor(path);
 			if (disc == null)
 			{
 				game = null;
@@ -826,6 +831,12 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s
 							retro.Dispose();
 							return false;
 						}
+						// else success; update game name
+						var ext = file.Extension;
+						var gi = Disc.IsValidExtension(ext)
+							? MakeGameFromDisc(InstantiateDiscFor(path), ext: ext, name: Path.GetFileNameWithoutExtension(file.Name))
+							: new RomGame(file).GameInfo;
+						Game.Name = $"{gi.Name} [{Game.Name/* core name */}]";
 					}
 				}
 				else