From 09dd55eb931388a7e7cdc26e76cf12e1b365a103 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Sat, 21 Sep 2024 16:53:14 +0200 Subject: [PATCH] Fix nullref when no movie exists fixes 259929499fd0861060551515afbb4e2e8d8f8834 --- 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 449a9b8b26..1acec07611 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -4147,7 +4147,7 @@ namespace BizHawk.Client.EmuHawk return; } - if (Emulator.Frame > MovieSession.Movie.FrameCount) + if (MovieSession.Movie.IsActive() && Emulator.Frame > MovieSession.Movie.FrameCount) { OSD.AddMessage("Cannot savestate after movie end!"); return;