diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-10-04 01:06:55 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-10-04 01:06:55 +0200 |
| commit | e85c19adcb71149922332150d45d671f90bd1f9f (patch) | |
| tree | 39797c4c6e70786fe2e4a6aba643c48db8f33be7 /src/core/hid | |
| parent | Merge pull request #8955 from german77/amiibo-rewrite (diff) | |
| download | yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar.gz yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar.bz2 yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar.lz yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar.xz yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.tar.zst yuzu-e85c19adcb71149922332150d45d671f90bd1f9f.zip | |
Diffstat (limited to 'src/core/hid')
| -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 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( |