Merge pull request #2507 from comex/asdfasdfasdfasdf

fix duplicate variable definition
2015-06-03 01:00:24 +02:00 · 2015-06-03 01:00:24 +02:00 · 64ccea4e05
parent a3b3f0522b 97d6b71f3f
commit 64ccea4e05
1 changed files with 1 additions and 1 deletions
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@ -1466,7 +1466,7 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
 			g_Config.iStereoConvergence = 500;
 	}

-	for (int i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i)
+	for (i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i)
 	{
 		if (IsHotkey(event, i))
 		{