Skip to content

Commit

Permalink
Merge pull request #2740 from AdmiralCurtiss/last-slot-10-hotkeys
Browse files Browse the repository at this point in the history
Forgot to add the Load Last Slot 9/10 hotkey to a switch in #2739.
  • Loading branch information
lioncash committed Jul 12, 2015
2 parents de3379a + 5c0033e commit b9182de
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Source/Core/DolphinWX/Frame.cpp
Expand Up @@ -988,6 +988,8 @@ int GetCmdForHotkey(unsigned int key)
case HK_LOAD_LAST_STATE_6: return IDM_LOAD_LAST_6;
case HK_LOAD_LAST_STATE_7: return IDM_LOAD_LAST_7;
case HK_LOAD_LAST_STATE_8: return IDM_LOAD_LAST_8;
case HK_LOAD_LAST_STATE_9: return IDM_LOAD_LAST_9;
case HK_LOAD_LAST_STATE_10: return IDM_LOAD_LAST_10;

case HK_SAVE_FIRST_STATE: return IDM_SAVE_FIRST_STATE;
case HK_UNDO_LOAD_STATE: return IDM_UNDO_LOAD_STATE;
Expand Down Expand Up @@ -1440,7 +1442,7 @@ void CFrame::ParseHotkeys()
VertexShaderManager::ResetView();

// Savestates
for (int i = 0; i < 10; i++)
for (int i = 0; i < State::NUM_STATES; i++)
{
if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
State::Load(1 + i);
Expand Down

0 comments on commit b9182de

Please sign in to comment.