summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar liamwhite2023-12-21 10:50:22 -0500
committerGravatar GitHub2023-12-21 10:50:22 -0500
commitad7445d4ccedc965e6b9314923fb8da309d97917 (patch)
tree99b9015b6c492a77c256a829fef296b192cf921e /src/core
parentMerge pull request #12426 from t895/reload-text-fix (diff)
parentservice: hid: Fix crash on InitializeVibrationDevice (diff)
downloadyuzu-ad7445d4ccedc965e6b9314923fb8da309d97917.tar.gz
yuzu-ad7445d4ccedc965e6b9314923fb8da309d97917.tar.xz
yuzu-ad7445d4ccedc965e6b9314923fb8da309d97917.zip
Merge pull request #12425 from german77/temp-fix
service: hid: Fix crash on InitializeVibrationDevice
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/hid_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp
index de24b0401..06a01c02c 100644
--- a/src/core/hle/service/hid/hid_server.cpp
+++ b/src/core/hle/service/hid/hid_server.cpp
@@ -51,7 +51,7 @@ private:
51 IPC::RequestParser rp{ctx}; 51 IPC::RequestParser rp{ctx};
52 const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; 52 const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()};
53 53
54 if (resource_manager != nullptr) { 54 if (resource_manager != nullptr && resource_manager->GetNpad()) {
55 resource_manager->GetNpad()->InitializeVibrationDevice(vibration_device_handle); 55 resource_manager->GetNpad()->InitializeVibrationDevice(vibration_device_handle);
56 } 56 }
57 57