diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index f6137370be..c60dfca7ad 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -112,7 +112,7 @@ namespace BizHawk.Client.Common } } - public void HandleMovieOnFrameLoop(bool clearFramePressed) + public void HandleMovieOnFrameLoop() { if (!Movie.IsActive) { @@ -151,7 +151,7 @@ namespace BizHawk.Client.Common { Movie.CaptureState(); LatchInputFromLog(); - if (clearFramePressed) + if (Global.ClientControls["Scrub Input"]) { LatchInputFromPlayer(Global.MovieInputSourceAdapter); ClearFrame(); diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 2a203f869e..f476892a0f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2646,7 +2646,7 @@ namespace BizHawk.Client.EmuHawk else if (!Global.Config.MuteFrameAdvance) genSound = true; - Global.MovieSession.HandleMovieOnFrameLoop(Global.ClientControls["ClearFrame"]); + Global.MovieSession.HandleMovieOnFrameLoop(); coreskipaudio = Global.ClientControls["Turbo"] && CurrAviWriter == null; //=======================================