From ea63fd5516c75e3099ffc52f8b2e927db80d39ee Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 20 Sep 2015 21:08:26 -0500
Subject: [PATCH] when continuous-frame-rewinding and clock throttle isnt
 enabled, clock throttling would occur--not any more.

---
 BizHawk.Client.EmuHawk/Throttle.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/Throttle.cs b/BizHawk.Client.EmuHawk/Throttle.cs
index 4e56f0f24b..e09dda2b99 100644
--- a/BizHawk.Client.EmuHawk/Throttle.cs
+++ b/BizHawk.Client.EmuHawk/Throttle.cs
@@ -101,7 +101,8 @@ namespace BizHawk.Client.EmuHawk
 				{
 					//dont ever skip frames when continuous frame advancing. it's meant for precision work.
 					//but we DO need to throttle
-					extraThrottle = true;
+					if(Global.Config.ClockThrottle)
+						extraThrottle = true;
 				}
 				else
 				{