From f234e15df6b9fc0dd97b7127886bf3307f3deee7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 10 Oct 2012 23:38:15 +0000
Subject: [PATCH] Movie UpdateToolsBefore() earlier in the frame loop

---
 BizHawk.MultiClient/MainForm.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 0cafe6a992..b65f75be90 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2121,6 +2121,11 @@ namespace BizHawk.MultiClient
 
 		void StepRunLoop_Core()
 		{
+			bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"];
+			bool fff = Global.ClientControls["MaxTurbo"];
+			bool updateFpsString = (runloop_last_ff != ff);
+			runloop_last_ff = ff;
+
 			bool runFrame = false;
 			runloop_frameadvance = false;
 			DateTime now = DateTime.Now;
@@ -2129,6 +2134,11 @@ namespace BizHawk.MultiClient
 			double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds;
 			bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta;
 
+			if (!fff)
+			{
+				UpdateToolsBefore();
+			}
+
 			if (Global.Config.SkipLagFrame && Global.Emulator.IsLagFrame && frameProgressTimeElapsed)
 			{
 				Global.Emulator.FrameAdvance(true);
@@ -2203,18 +2213,8 @@ namespace BizHawk.MultiClient
 			if (runFrame)
 			{
 				runloop_fps++;
-				
-				bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"];
-				bool fff = Global.ClientControls["MaxTurbo"];
-				bool updateFpsString = (runloop_last_ff != ff);
-				runloop_last_ff = ff;
-				
 				//client input-related duties
 				Global.OSD.ClearGUIText();
-				if (!fff)
-				{
-					UpdateToolsBefore();
-				}
 
 				if ((DateTime.Now - runloop_second).TotalSeconds > 1)
 				{