From d6760363597b8cf23bb8d41154d4b6d61bfd8b65 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Fri, 20 Nov 2020 17:25:01 -0500
Subject: [PATCH] Movies: reorder code so that record mode is not entered if
 state load failed

---
 src/BizHawk.Client.Common/movie/MovieSession.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs
index bc18ccd126..364f9274e1 100644
--- a/src/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/MovieSession.cs
@@ -162,6 +162,14 @@ namespace BizHawk.Client.Common
 			}
 			else
 			{
+				// Don't enter recording mode if state load fails
+				var result = Movie.ExtractInputLog(reader, out var errorMsg);
+				if (!result)
+				{
+					Output(errorMsg);
+					return false;
+				}
+
 				if (Movie.IsFinished())
 				{
 					Movie.StartNewRecording();
@@ -172,13 +180,6 @@ namespace BizHawk.Client.Common
 				}
 
 				LatchInputToUser();
-
-				var result = Movie.ExtractInputLog(reader, out var errorMsg);
-				if (!result)
-				{
-					Output(errorMsg);
-					return false;
-				}
 			}
 
 			return true;