From ed5cfe39a6bca49625ba93fb42175207d6628211 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 3 Nov 2013 16:53:05 +0000
Subject: [PATCH] 1.5x and trunk - fix scrub input hotkey, on trunk a slight
 refactoring now that more things are in client.common

---
 BizHawk.Client.Common/movie/MovieSession.cs | 4 ++--
 BizHawk.Client.EmuHawk/MainForm.cs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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;
 				//=======================================