From 0b8e4ab6b15e961b11aaa8ba17e4c5e9d0a0b349 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Fri, 20 Nov 2020 19:20:55 -0500
Subject: [PATCH] Movies: revert previous 2 commits, too many difficulties
 around movies in 'finished' mode

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

diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs
index 4c7aaf7d3e..aae18f6aef 100644
--- a/src/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/MovieSession.cs
@@ -162,7 +162,15 @@ namespace BizHawk.Client.Common
 			}
 			else
 			{
-				// Don't enter recording mode if state load fails
+				if (Movie.IsFinished())
+				{
+					Movie.StartNewRecording();
+				}
+				else if (Movie.IsPlayingOrFinished())
+				{
+					Movie.SwitchToRecord();
+				}
+
 				var result = Movie.ExtractInputLog(reader, out var errorMsg);
 				if (!result)
 				{
@@ -170,11 +178,6 @@ namespace BizHawk.Client.Common
 					return false;
 				}
 
-				if (Movie.IsPlayingOrFinished())
-				{
-					Movie.SwitchToRecord();
-				}
-
 				LatchInputToUser();
 			}