From 878629a2bf7a4626733f974f5c4c5b595057482b Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 12 Jul 2015 05:16:42 +0200 Subject: [PATCH 1/2] DolphinWX: GetCmdForHotkey() should have Load Last Slot 9/10 as well. --- Source/Core/DolphinWX/Frame.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index dc4c3e6808d8..b9df32bd0db0 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; From 5c0033e6d98bacda85ea16f07616d8e754644903 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 12 Jul 2015 05:18:54 +0200 Subject: [PATCH 2/2] DolphinWX: ParseHotkeys() should use the State::NUM_STATES constant instead of a hardcoded 10. --- Source/Core/DolphinWX/Frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index b9df32bd0db0..5c187b07ce0a 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1442,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);