diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-28 23:20:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 23:20:23 -0800 |
| commit | 6750b4d3afb2a3bdcd4b1021be3f1367e9170627 (patch) | |
| tree | e380c6dbc9352674551b19ddee8248c4d9de3209 /src | |
| parent | 6314ed5de02ec446727cc9582e7597afeeeb0e04 (diff) | |
| parent | 6f70e1b1ff01830ff651aa3e38048e659d61b26e (diff) | |
Merge pull request #4998 from Morph1984/bioshock-patch
hid: Check if applet_resource exists in InitializeVibrationDevice
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index a1d307a416..b3c7234e11 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -157,8 +157,10 @@ private: IPC::RequestParser rp{ctx}; const auto vibration_device_handle{rp.PopRaw<Controller_NPad::DeviceHandle>()}; - applet_resource->GetController<Controller_NPad>(HidController::NPad) - .InitializeVibrationDevice(vibration_device_handle); + if (applet_resource != nullptr) { + applet_resource->GetController<Controller_NPad>(HidController::NPad) + .InitializeVibrationDevice(vibration_device_handle); + } LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}", vibration_device_handle.npad_type, vibration_device_handle.npad_id, |