diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index 7a50f64619..24c92beada 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -40,7 +40,7 @@ namespace BizHawk.Client.Common public IMovie Movie { get; set; } public bool ReadOnly { get; set; } = true; - public bool MovieIsQueued => _queuedMovie != null; + public bool NewMovieQueued => _queuedMovie != null; public string QueuedSyncSettings => _queuedMovie.SyncSettingsJson; public IMovieController MovieController { get; set; } = new Bk2Controller("", NullController.Instance.Definition); diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs index c87c3dccc0..d121901a1f 100644 --- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs +++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs @@ -8,7 +8,10 @@ namespace BizHawk.Client.Common IMovie Movie { get; set; } bool ReadOnly { get; set; } - bool MovieIsQueued { get; } + /// + /// Gets a value indicating whether or not a new movie is queued for loading + /// + bool NewMovieQueued { get; } /// /// Gets the sync settings from a queued movie, if a movie is queued diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 2cc6073134..f64c397a0d 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2269,7 +2269,7 @@ namespace BizHawk.Client.EmuHawk private void CoreSyncSettings(object sender, RomLoader.SettingsLoadArgs e) { - if (MovieSession.MovieIsQueued) + if (MovieSession.NewMovieQueued) { if (!string.IsNullOrWhiteSpace(MovieSession.QueuedSyncSettings)) { @@ -3608,7 +3608,7 @@ namespace BizHawk.Client.EmuHawk // movies should require deterministic emulation in ALL cases // if the core is managing its own DE through SyncSettings a 'deterministic' bool can be passed into the core's constructor // it is then up to the core itself to override its own local DeterministicEmulation setting - bool deterministic = args.Deterministic ?? MovieSession.MovieIsQueued; + bool deterministic = args.Deterministic ?? MovieSession.NewMovieQueued; if (!Tools.AskSave()) { @@ -3774,7 +3774,7 @@ namespace BizHawk.Client.EmuHawk JumpLists.AddRecentItem(openAdvancedArgs, ioa.DisplayName); // Don't load Save Ram if a movie is being loaded - if (!MovieSession.MovieIsQueued) + if (!MovieSession.NewMovieQueued) { var movieIsActive = MovieSession.Movie.IsActive(); if (File.Exists(Config.PathEntries.SaveRamAbsolutePath(loader.Game, movieIsActive)))