summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2022-09-01 07:20:22 +0200
committergerman77 <juangerman-13@hotmail.com>2022-09-07 08:04:00 +0200
commit4834961736f95ac99deb8edd2af51be5276a041f (patch)
tree367f69ae6b6388cac8c3756d918a60e39103b062 /src
parentcore: nfp: Correct date and amiibo name (diff)
downloadyuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar.gz
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar.bz2
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar.lz
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar.xz
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.tar.zst
yuzu-4834961736f95ac99deb8edd2af51be5276a041f.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nfp/nfp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index fb89f6911..e0ed3f771 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -1069,7 +1069,9 @@ DeviceState Module::Interface::GetCurrentState() const {
}
Core::HID::NpadIdType Module::Interface::GetNpadId() const {
- return npad_id;
+ // Return first connected npad id as a workaround for lack of a single nfc interface per
+ // controller
+ return system.HIDCore().GetFirstNpadId();
}
AmiiboName Module::Interface::GetAmiiboName(const AmiiboSettings& settings) const {