summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-11-25 19:33:01 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-11-25 19:33:30 +0100
commit6f70e1b1ff01830ff651aa3e38048e659d61b26e (patch)
tree9c908f8bc5ec4c963d81260899347be7fef1ece1 /src/core/hle/service
parentMerge pull request #4978 from bunnei/shutdown-crash (diff)
downloadyuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar.gz
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar.bz2
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar.lz
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar.xz
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.tar.zst
yuzu-6f70e1b1ff01830ff651aa3e38048e659d61b26e.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/hid/hid.cpp6
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 902516b29..db9f5e701 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -155,8 +155,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,