diff options
| author | bunnei <bunneidev@gmail.com> | 2022-10-05 14:13:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 14:13:57 -0700 |
| commit | 67d9e90872de45e2565e422310eb3d5f1abe3188 (patch) | |
| tree | 3daa0c297084278fdb67b8f3d1f61ca62794b870 /src/core/hid/emulated_controller.cpp | |
| parent | 538ae13298f27077d8957b6cdfba4877d2289588 (diff) | |
| parent | 280a232e27d6e0d975fe73441ceeb06a3556b30e (diff) | |
Merge pull request #9015 from german77/amiibo-rewrite
service: nfp: Fix errors to pass unit testing
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index e27d84734b..025f1c78e4 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( |