From 4834961736f95ac99deb8edd2af51be5276a041f Mon Sep 17 00:00:00 2001 From: german77 Date: Thu, 1 Sep 2022 00:20:22 -0500 Subject: core: nfp: Workaround for lack of multiple nfp interfaces --- src/core/hle/service/nfp/nfp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 { -- cgit v1.2.3