Merge pull request #4998 from Morph1984/bioshock-patch

hid: Check if applet_resource exists in InitializeVibrationDevice
This commit is contained in:
bunnei 2020-11-28 23:20:23 -08:00 committed by GitHub
commit 6750b4d3af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -157,8 +157,10 @@ private:
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto vibration_device_handle{rp.PopRaw<Controller_NPad::DeviceHandle>()}; const auto vibration_device_handle{rp.PopRaw<Controller_NPad::DeviceHandle>()};
if (applet_resource != nullptr) {
applet_resource->GetController<Controller_NPad>(HidController::NPad) applet_resource->GetController<Controller_NPad>(HidController::NPad)
.InitializeVibrationDevice(vibration_device_handle); .InitializeVibrationDevice(vibration_device_handle);
}
LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}", LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}",
vibration_device_handle.npad_type, vibration_device_handle.npad_id, vibration_device_handle.npad_type, vibration_device_handle.npad_id,