diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-30 16:54:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 16:54:35 -0800 |
| commit | 667a8ae163681f68d90010bc7dd05eb7398524d6 (patch) | |
| tree | dea803db312fc0e36c5ed2c9000cacf3bd4df7c3 /src/core/hid/emulated_controller.cpp | |
| parent | 5e5827190374946cc906da3a5d2aa586a9721ba0 (diff) | |
| parent | 9ee5c4ec5629c185d29dd41468047004acef2e29 (diff) | |
Merge pull request #7647 from german77/toad
core/hid: Fix controller type validation
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index ff9d7a7e36..2d3fce2761 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -886,8 +886,9 @@ void EmulatedController::SetSupportedNpadStyleTag(NpadStyleTag supported_styles) } } -bool EmulatedController::IsControllerSupported() const { - switch (npad_type) { +bool EmulatedController::IsControllerSupported(bool use_temporary_value) const { + const auto type = is_configuring && use_temporary_value ? tmp_npad_type : npad_type; + switch (type) { case NpadStyleIndex::ProController: return supported_style_tag.fullkey; case NpadStyleIndex::Handheld: @@ -915,9 +916,10 @@ bool EmulatedController::IsControllerSupported() const { } } -void EmulatedController::Connect() { - if (!IsControllerSupported()) { - LOG_ERROR(Service_HID, "Controller type {} is not supported", npad_type); +void EmulatedController::Connect(bool use_temporary_value) { + if (!IsControllerSupported(use_temporary_value)) { + const auto type = is_configuring && use_temporary_value ? tmp_npad_type : npad_type; + LOG_ERROR(Service_HID, "Controller type {} is not supported", type); return; } { |