diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-02-03 12:26:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 12:26:14 -0800 |
| commit | eee24cd1ceb7006dee3f0015d957d8d14b3a5f1e (patch) | |
| tree | b504cbb868d9ef81a565f5a0fb201152d7411654 /Source/Core | |
| parent | 8aaebfa2b37a9dbcc519f51c9ea1ade263aa525a (diff) | |
| parent | d70ea9e4ec6c2266503e70fe6d5b294b24ca9901 (diff) | |
Merge pull request #7746 from Techjar/fix-hotkey-conflicts
[RFC] Core/HotkeyManager: Fix default hotkey conflicts
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 3f98ba67d1..82d5c51b8b 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -387,18 +387,18 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface) // General hotkeys set_key_expression(HK_OPEN, CTRL + " & O"); - set_key_expression(HK_PLAY_PAUSE, "`F10`"); + set_key_expression(HK_PLAY_PAUSE, NON + " & `F10`"); #ifdef _WIN32 - set_key_expression(HK_STOP, "ESCAPE"); + set_key_expression(HK_STOP, NON + " & ESCAPE"); set_key_expression(HK_FULLSCREEN, ALT + " & RETURN"); #else - set_key_expression(HK_STOP, "Escape"); + set_key_expression(HK_STOP, NON + " & Escape"); set_key_expression(HK_FULLSCREEN, ALT + " & Return"); #endif set_key_expression(HK_STEP, NON + " & `F11`"); - set_key_expression(HK_STEP_OVER, NON + " & `F10`"); + set_key_expression(HK_STEP_OVER, SHIFT + " & `F10`"); set_key_expression(HK_STEP_OUT, SHIFT + " & `F11`"); - set_key_expression(HK_BP_TOGGLE, NON + " & `F9`"); + set_key_expression(HK_BP_TOGGLE, SHIFT + " & `F9`"); set_key_expression(HK_SCREENSHOT, NON + " & `F9`"); set_key_expression(HK_WIIMOTE1_CONNECT, ALT + " & `F5`"); set_key_expression(HK_WIIMOTE2_CONNECT, ALT + " & `F6`"); @@ -406,9 +406,9 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface) set_key_expression(HK_WIIMOTE4_CONNECT, ALT + " & `F8`"); set_key_expression(HK_BALANCEBOARD_CONNECT, ALT + " & `F9`"); #ifdef _WIN32 - set_key_expression(HK_TOGGLE_THROTTLE, "TAB"); + set_key_expression(HK_TOGGLE_THROTTLE, NON + " & TAB"); #else - set_key_expression(HK_TOGGLE_THROTTLE, "Tab"); + set_key_expression(HK_TOGGLE_THROTTLE, NON + " & Tab"); #endif // Freelook |