diff options
| author |  liamwhite | 2024-02-13 08:17:50 -0500 |
|---|---|---|
| committer |  GitHub | 2024-02-13 08:17:50 -0500 |
| commit | 3511d5552a94f4fb6cf15ffc24c5629a67051c4b (patch) | |
| tree | f9a0a027db9b1b9f80764d207f7971efee41143e | |
| parent | Merge pull request #12998 from t895/swap-clear-actions (diff) | |
| parent | yuzu: Allow non npad hotkeys and disable controller navigation requirement (diff) | |
| download | yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.gz yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.xz yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.zip | |
Merge pull request #12989 from german77/hotcake
yuzu: Allow non npad hotkeys and disable controller navigation requirement
| -rw-r--r-- | src/yuzu/hotkeys.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp index 170f14684..1931dcd1f 100644 --- a/src/yuzu/hotkeys.cpp +++ b/src/yuzu/hotkeys.cpp | |||
| @@ -190,10 +190,8 @@ void ControllerShortcut::ControllerUpdateEvent(Core::HID::ControllerTriggerType | |||
| 190 | if (type != Core::HID::ControllerTriggerType::Button) { | 190 | if (type != Core::HID::ControllerTriggerType::Button) { |
| 191 | return; | 191 | return; |
| 192 | } | 192 | } |
| 193 | if (!Settings::values.controller_navigation) { | 193 | if (button_sequence.npad.raw == Core::HID::NpadButton::None && |
| 194 | return; | 194 | button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) { |
| 195 | } | ||
| 196 | if (button_sequence.npad.raw == Core::HID::NpadButton::None) { | ||
| 197 | return; | 195 | return; |
| 198 | } | 196 | } |
| 199 | 197 | ||