diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-07-12 00:05:53 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-07-12 00:05:53 -0400 |
| commit | b9182dec61cc45c3af8585d2cef4bc8a2a57d586 (patch) | |
| tree | 9572234acc7804aefb09d9e2d8e56a33a7e8dc10 /Source | |
| parent | de3379a1b2418d48597f8a92b00cc7d9719218a8 (diff) | |
| parent | 5c0033e6d98bacda85ea16f07616d8e754644903 (diff) | |
Merge pull request #2740 from AdmiralCurtiss/last-slot-10-hotkeys
Forgot to add the Load Last Slot 9/10 hotkey to a switch in #2739.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index dc4c3e6808..5c187b07ce 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -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; @@ -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); |