Fix window title after loading rom via FW config (fixes #3581)

YoshiRulz · YoshiRulz · commit 7c3e35f3e739 · 2023-03-17T06:37:38.000+10:00
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3835,10 +3835,9 @@ private bool LoadRomInternal(string path, LoadRomArgs args, out bool failureIsFr
 					//path = ioa_openrom.Path;
 				}
 
-				var oldGame = Game;
 				var result = loader.LoadRom(path, nextComm, ioaRetro?.CorePath, forcedCoreName: MovieSession.QueuedCoreName);
 
-				Game = result ? loader.Game : oldGame;
+				if (result) Game = loader.Game;
 
 				// 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)

Original file line number	Diff line number	Diff line change
`@@ -3835,10 +3835,9 @@ private bool LoadRomInternal(string path, LoadRomArgs args, out bool failureIsFr`
`3835`	`3835`	`//path = ioa_openrom.Path;`
`3836`	`3836`	`}`
`3837`	`3837`
`3838`		`- var oldGame = Game;`
`3839`	`3838`	`var result = loader.LoadRom(path, nextComm, ioaRetro?.CorePath, forcedCoreName: MovieSession.QueuedCoreName);`
`3840`	`3839`
`3841`		`- Game = result ? loader.Game : oldGame;`
	`3840`	`+ if (result) Game = loader.Game;`
`3842`	`3841`
`3843`	`3842`	`// we need to replace the path in the OpenAdvanced with the canonical one the user chose.`
`3844`	`3843`	`// It can't be done until loader.LoadRom happens (for CanonicalFullPath)`