core: nfp: Workaround for lack of multiple nfp interfaces

3 years ago · 4834961736
1 changed files with 3 additions and 1 deletions
--- 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 {