summaryrefslogtreecommitdiffstats
path: root/src/core/hid/emulated_controller.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-10-05 23:13:57 +0200
committerGitHub <noreply@github.com>2022-10-05 23:13:57 +0200
commit1689530f520f72ca198de421519fd2d6658af2d1 (patch)
tree3daa0c297084278fdb67b8f3d1f61ca62794b870 /src/core/hid/emulated_controller.cpp
parentShow error from cpp-httplib when we don't have a response to read (report errors while connecting to API) (#8999) (diff)
parentservice: nfp: Fix errors to pass unit testing (diff)
downloadyuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar.gz
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar.bz2
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar.lz
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar.xz
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.tar.zst
yuzu-1689530f520f72ca198de421519fd2d6658af2d1.zip
Diffstat (limited to '')
-rw-r--r--src/core/hid/emulated_controller.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index e27d84734..025f1c78e 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -1017,9 +1017,11 @@ bool EmulatedController::SetPollingMode(Common::Input::PollingMode polling_mode)
auto& output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
auto& nfc_output_device = output_devices[3];
- nfc_output_device->SetPollingMode(polling_mode);
+ const auto virtual_nfc_result = nfc_output_device->SetPollingMode(polling_mode);
+ const auto mapped_nfc_result = output_device->SetPollingMode(polling_mode);
- return output_device->SetPollingMode(polling_mode) == Common::Input::PollingError::None;
+ return virtual_nfc_result == Common::Input::PollingError::None ||
+ mapped_nfc_result == Common::Input::PollingError::None;
}
bool EmulatedController::SetCameraFormat(