diff options
| author |  german77 | 2024-02-11 16:07:53 -0600 |
|---|---|---|
| committer | german77 | 2024-02-11 16:29:31 -0600 |
| commit | 26e028808ac48fed3509c86f7084a801ed36daf2 (patch) | |
| tree | 13460aa95e45e9af010e92a1cd07d9e97a0e2a7a /src | |
| parent | Merge pull request #12969 from german77/bcat-interface (diff) | |
| download | yuzu-26e028808ac48fed3509c86f7084a801ed36daf2.tar.gz yuzu-26e028808ac48fed3509c86f7084a801ed36daf2.tar.xz yuzu-26e028808ac48fed3509c86f7084a801ed36daf2.zip | |
yuzu: Allow non npad hotkeys and disable controller navigation requirement
Diffstat (limited to 'src')
| -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 | ||