diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-13 14:17:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-13 14:17:50 +0100 |
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 yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.gz yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.bz2 yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.lz yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.xz yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.tar.zst yuzu-3511d5552a94f4fb6cf15ffc24c5629a67051c4b.zip |
-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 if (type != Core::HID::ControllerTriggerType::Button) { return; } - if (!Settings::values.controller_navigation) { - return; - } - if (button_sequence.npad.raw == Core::HID::NpadButton::None) { + if (button_sequence.npad.raw == Core::HID::NpadButton::None && + button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) { return; } |