From 219b33732c7d305014a7f744fa7ba4cbac098248 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 14 Jul 2020 17:47:22 -0500
Subject: [PATCH] make TasMovie Emulator null check a bit clearer as to what is
 going on

---
 src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs     | 2 ++
 src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
index 1fdff995bc..34554c2b98 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
@@ -27,6 +27,8 @@ namespace BizHawk.Client.Common
 			Emulator = emulator;
 		}
 
+		protected bool IsAttached() => Emulator != null;
+
 		public IEmulator Emulator { get; private set; }
 		public IMovieSession Session { get; }
 
diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 81aff75e93..844cfc1d53 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -81,12 +81,9 @@ namespace BizHawk.Client.Common
 				var lagged = LagLog[lagIndex];
 				if (lagged == null)
 				{
-					if (Emulator != null)
+					if (IsAttached() && Emulator.Frame == lagIndex)
 					{
-						if (Emulator.Frame == lagIndex)
-						{
-							lagged = _inputPollable.IsLagFrame;
-						}					
+						lagged = _inputPollable.IsLagFrame;
 					}
 				}