From 2dacb356c2bf191ffb23f98554def32e992e189d Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 11 Oct 2012 22:37:44 +0000
Subject: [PATCH] OOPS!  Undo my change with moving UpdateToolsBefore()

---
 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 099bde8c81..42d6c45aa9 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2153,11 +2153,6 @@ 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;
@@ -2166,11 +2161,6 @@ 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);
@@ -2245,6 +2235,16 @@ namespace BizHawk.MultiClient
 			bool coreskipaudio = false;
 			if (runFrame)
 			{
+				bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"];
+				bool fff = Global.ClientControls["MaxTurbo"];
+				bool updateFpsString = (runloop_last_ff != ff);
+				runloop_last_ff = ff;
+
+				if (!fff)
+				{
+					UpdateToolsBefore();
+				}
+
 				runloop_fps++;
 				//client input-related duties
 				Global.OSD.ClearGUIText();