Merge pull request #81 from degasus/skip_framelimit_hotkey

Add a hotkey for disabling the framelimit.

1 files changed, 16 insertions, 1 deletions

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 87fb799616..26627d2340 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -940,6 +940,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			OSDChoice = 4;
 			g_Config.bDisableFog = !g_Config.bDisableFog;
 		}
+		else if (IsHotkey(event, HK_TOGGLE_THROTTLE))
+		{
+			Core::SetIsFramelimiterTempDisabled(true);
+		}
 		else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT))
 		{
 			if (++SConfig::GetInstance().m_Framelimit > 0x19)
@@ -1040,7 +1044,18 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 
 void CFrame::OnKeyUp(wxKeyEvent& event)
 {
-	event.Skip();
+	if(Core::GetState() != Core::CORE_UNINITIALIZED &&
+			(RendererHasFocus() || TASInputHasFocus()))
+	{
+		if (IsHotkey(event, HK_TOGGLE_THROTTLE))
+		{
+			Core::SetIsFramelimiterTempDisabled(false);
+		}
+	}
+	else
+	{
+		event.Skip();
+	}
 }
 
 void CFrame::OnMouse(wxMouseEvent& event)