From 9085bd6e0c989857527579a4bfd2291e9765c7da Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Sat, 17 Aug 2024 22:25:55 +0200
Subject: [PATCH] Set correct GameInfo even when rom loading failed

- closes #3986

(maybe this should be in CloseGame as well?)
---
 src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 24b393b9f5..ee5ab8fe43 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3645,7 +3645,7 @@ namespace BizHawk.Client.EmuHawk
 
 				var result = loader.LoadRom(path, nextComm, ioaRetro?.CorePath, forcedCoreName: MovieSession.QueuedCoreName);
 
-				if (result) Game = loader.Game;
+				Game = result ? loader.Game : GameInfo.NullInstance;
 
 				// we need to replace the path in the OpenAdvanced with the canonical one the user chose.
 				// It can't be done until loader.LoadRom happens (for CanonicalFullPath)