Skip to content
Permalink
Browse files

Merge pull request #7746 from Techjar/fix-hotkey-conflicts

[RFC] Core/HotkeyManager: Fix default hotkey conflicts
  • Loading branch information...
Helios747 committed Feb 3, 2019
2 parents 8aaebfa + d70ea9e commit eee24cd1ceb7006dee3f0015d957d8d14b3a5f1e
Showing with 7 additions and 7 deletions.
  1. +7 −7 Source/Core/Core/HotkeyManager.cpp
@@ -387,28 +387,28 @@ 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`");
set_key_expression(HK_WIIMOTE3_CONNECT, ALT + " & `F7`");
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

0 comments on commit eee24cd

Please sign in to comment.
You can’t perform that action at this time.