From d0d526f746c3f307567acf70106096d0b613dfab Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 23 May 2020 13:16:20 -0500 Subject: [PATCH] Some fixes to movie mode extensions, these aren't bugs, yet, as the scenarios never occur --- src/BizHawk.Client.Common/movie/interfaces/IMovie.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs b/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs index 7a2564b5af..052774fab3 100644 --- a/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs +++ b/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs @@ -228,11 +228,11 @@ namespace BizHawk.Client.Common public static class MovieExtensions { - public static bool IsActive(this IMovie movie) => movie?.Mode != MovieMode.Inactive; + public static bool IsActive(this IMovie movie) => movie != null && movie.Mode != MovieMode.Inactive; public static bool NotActive(this IMovie movie) => movie == null || movie.Mode == MovieMode.Inactive; public static bool IsPlaying(this IMovie movie) => movie?.Mode == MovieMode.Play || movie?.Mode == MovieMode.Finished; public static bool IsRecording(this IMovie movie) => movie?.Mode == MovieMode.Record; - public static bool IsFinished(this IMovie movie) => movie.Mode == MovieMode.Finished; + public static bool IsFinished(this IMovie movie) => movie?.Mode == MovieMode.Finished; public static bool IsPlayingOrRecording(this IMovie movie) => movie?.Mode == MovieMode.Play || movie?.Mode == MovieMode.Record;