Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

service: hid: Make sure there's an active aruid handle

german7773a46f5fcb61
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index e6c0356289..97f31d26e5 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -870,6 +870,11 @@ void NPad::InitializeVibrationDevice(
const auto aruid = applet_resource_holder.applet_resource->GetActiveAruid();
const auto npad_index = static_cast<Core::HID::NpadIdType>(vibration_device_handle.npad_id);
const auto device_index = static_cast<std::size_t>(vibration_device_handle.device_index);
+
+ if (aruid == 0) {
+ return;
+ }
+
InitializeVibrationDeviceAtIndex(aruid, npad_index, device_index);
}