From a4ce9e93dce974907edf542fb37948cbe75e13c1 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 27 May 2025 11:06:56 +1000 Subject: [PATCH] Don't do checks on `MovieSession.QueuedCoreName` when no movie queued fixes cc59818d6 --- src/BizHawk.Client.EmuHawk/MainForm.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 2307d65474..aad88a8267 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -3821,8 +3821,9 @@ namespace BizHawk.Client.EmuHawk //path = ioa_openrom.Path; } - var forcedCoreName = MovieSession.QueuedCoreName ?? string.Empty; - if (!CoreInventory.Instance.SystemsFlat.Any(core => core.Name == forcedCoreName)) + var forcedCoreName = MovieSession.QueuedCoreName; + if (forcedCoreName is not null + && !CoreInventory.Instance.SystemsFlat.Any(core => core.Name == forcedCoreName)) { const string FMT_STR_NO_SUCH_CORE = "This movie is for the \"{0}\" core," + " but that's not a valid {1} core. (Was the movie made in this version of EmuHawk?)"