Merge pull request #2507 from comex/asdfasdfasdfasdf
fix duplicate variable definition
This commit is contained in:
commit
64ccea4e05
|
@ -1466,7 +1466,7 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
|
||||||
g_Config.iStereoConvergence = 500;
|
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))
|
if (IsHotkey(event, i))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue