diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 14cc82eb6d..81aff75e93 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -79,9 +79,15 @@ namespace BizHawk.Client.Common { var lagIndex = index + 1; var lagged = LagLog[lagIndex]; - if (lagged == null && Emulator.Frame == lagIndex) + if (lagged == null) { - lagged = _inputPollable.IsLagFrame; + if (Emulator != null) + { + if (Emulator.Frame == lagIndex) + { + lagged = _inputPollable.IsLagFrame; + } + } } return new TasMovieRecord