DolphinWX: Remove the Toggle IR hotkey.

This isn't necessary since Increase IR and Decrease IR are present.
dolphin-emu · Jun 12, 2015 · 0592a18 · 0592a18
1 parent 5ae1c07
commit 0592a18
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h
@@ -42,7 +42,6 @@ enum Hotkey
 	HK_INCREASE_IR,
 	HK_DECREASE_IR,
 
-	HK_TOGGLE_IR,
 	HK_TOGGLE_AR,
 	HK_TOGGLE_EFBCOPIES,
 	HK_TOGGLE_FOG,

diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
@@ -41,7 +41,6 @@ const std::string hotkey_labels[] =
 	_trans("Increase IR"),
 	_trans("Decrease IR"),
 
-	_trans("Toggle IR"),
 	_trans("Toggle Aspect Ratio"),
 	_trans("Toggle EFB Copies"),
 	_trans("Toggle Fog"),

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -1348,13 +1348,6 @@ void CFrame::ParseHotkeys()
 		OnConnectWiimote(evt);
 	}
 
-	if (IsHotkey(HK_TOGGLE_IR))
-	{
-		OSDChoice = 1;
-		// Toggle native resolution
-		if (++g_Config.iEFBScale > 11) // 8X Internal Resolution
-			g_Config.iEFBScale = SCALE_AUTO;
-	}
 	if (IsHotkey(HK_INCREASE_IR))
 	{
 		OSDChoice = 1;
@@ -1363,8 +1356,8 @@ void CFrame::ParseHotkeys()
 	if (IsHotkey(HK_DECREASE_IR))
 	{
 		OSDChoice = 1;
-		if (--g_Config.iEFBScale < SCALE_1X)
-			g_Config.iEFBScale = SCALE_1X;
+		if (--g_Config.iEFBScale < SCALE_AUTO)
+			g_Config.iEFBScale = SCALE_AUTO;
 	}
 	if (IsHotkey(HK_TOGGLE_AR))
 	{