Merge pull request #2507 from comex/asdfasdfasdfasdf

fix duplicate variable definition
This commit is contained in:
flacs
2015-06-03 01:00:24 +02:00

View File

@ -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))
{