Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

service: hid: Clear controller status when aruid is no longer used

Narr the Reg77f3deb03a44
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index 97537a2e26..de0f9cbb9e 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -1232,6 +1232,13 @@ Result NPad::RegisterAppletResourceUserId(u64 aruid) {
}
void NPad::UnregisterAppletResourceUserId(u64 aruid) {
+ // TODO: Remove this once abstract pad is emulated properly
+ const auto aruid_index = npad_resource.GetIndexFromAruid(aruid);
+ for (auto& controller : controller_data[aruid_index]) {
+ controller.is_connected = false;
+ controller.shared_memory = nullptr;
+ }
+
npad_resource.UnregisterAppletResourceUserId(aruid);
}