Browse Source

Merge pull request #12601 from german77/rocket

service: hid: Make sure there's an active aruid handle
liamwhite 2 years ago
parent
commit
a972341b5d
1 changed files with 5 additions and 0 deletions
  1. 5 0
      src/hid_core/resources/npad/npad.cpp

+ 5 - 0
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);
 }