From d03b93bfca6a4a57cc5377db9916980e8602a132 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 28 May 2010 13:47:13 +0000
Subject: [PATCH] Changed how the turbo key works. Now it'll always go to turbo
 mode, even when global frame limit is off. (When global frame limit is off,
 it'll enable it and go to turbo mode then.)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3097 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/gui/GlobalCommands.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pcsx2/gui/GlobalCommands.cpp b/pcsx2/gui/GlobalCommands.cpp
index 2de663f83d..a5bb5e1211 100644
--- a/pcsx2/gui/GlobalCommands.cpp
+++ b/pcsx2/gui/GlobalCommands.cpp
@@ -72,13 +72,18 @@ namespace Implementations
 
 	void Framelimiter_TurboToggle()
 	{
+		ScopedCoreThreadPause pauser;
+		
 		if( !g_Conf->EmuOptions.GS.FrameLimitEnable )
 		{
-			Console.WriteLn( "(FrameLimiter) Turbo toggle ignored; framelimiter is currently disabled." );
+			g_Conf->EmuOptions.GS.FrameLimitEnable = true;
+			g_LimiterMode = Limit_Turbo;
+			g_Conf->EmuOptions.GS.LimitScalar = g_Conf->Framerate.TurboScalar;
+			Console.WriteLn("(FrameLimiter) Turbo + FrameLimit ENABLED." );
+			pauser.AllowResume();
 			return;
 		}
 
-		ScopedCoreThreadPause pauser;
 		if( g_LimiterMode == Limit_Turbo )
 		{
 			GSsetVsync( g_Conf->EmuOptions.GS.VsyncEnable );