From 069bdddbbaa8d38848f2c677279c3362012c6d5b Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 5 Jun 2020 21:17:41 -0500 Subject: [PATCH] use Session.Settings more in movie classes now that it is never null --- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs | 6 +++--- src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs index 2f83fe5e62..d6a275bfb6 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs @@ -41,7 +41,7 @@ namespace BizHawk.Client.Common // We are in record mode so replace the movie log with the one from the savestate if (!Session.MultiTrack.IsActive) { - if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0) + if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0) { SaveBackup(); MakeBackup = false; @@ -124,14 +124,14 @@ namespace BizHawk.Client.Common if (stateFramei.StrictlyBoundedBy(0.RangeTo(Log.Count))) { - if (!Global.Config.Movies.VBAStyleMovieLoadState) + if (!Session.Settings.VBAStyleMovieLoadState) { Truncate(stateFramei); } } else if (stateFramei > Log.Count) // Post movie savestate { - if (!Global.Config.Movies.VBAStyleMovieLoadState) + if (!Session.Settings.VBAStyleMovieLoadState) { Truncate(Log.Count); } diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index f988f4556a..e9c5c07abd 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -184,7 +184,7 @@ namespace BizHawk.Client.Common int? timelineBranchFrame = null; // We are in record mode so replace the movie log with the one from the savestate - if (Global.Config.Movies.EnableBackupMovies && MakeBackup && Log.Count != 0) + if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0) { SaveBackup(); MakeBackup = false; @@ -240,14 +240,14 @@ namespace BizHawk.Client.Common if (stateFrameValue > 0 && stateFrameValue < Log.Count) { - if (!Global.Config.Movies.VBAStyleMovieLoadState) + if (!Session.Settings.VBAStyleMovieLoadState) { Truncate(stateFrameValue); } } else if (stateFrameValue > Log.Count) // Post movie savestate { - if (!Global.Config.Movies.VBAStyleMovieLoadState) + if (!Session.Settings.VBAStyleMovieLoadState) { Truncate(Log.Count); }