diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-06 10:24:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 10:24:46 -0500 |
| commit | 5016de3626c771ee51f4ced0b3d7610bd6a2140e (patch) | |
| tree | a096365940afbf1aa8567cd11d6f4865be5c4585 /src/hid_core/resources/npad/npad.cpp | |
| parent | d5fb9fd12cfd06503c61326e03359b43b73aefc2 (diff) | |
| parent | 8f192b494ae1628a9c91007691123eb9ac9c759e (diff) | |
Merge pull request #12928 from german77/motion-mp
service: hid: Add multiprocess support to six axis input
Diffstat (limited to 'src/hid_core/resources/npad/npad.cpp')
| -rw-r--r-- | src/hid_core/resources/npad/npad.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp index fe3fdc5cd..053625b55 100644 --- a/src/hid_core/resources/npad/npad.cpp +++ b/src/hid_core/resources/npad/npad.cpp @@ -131,7 +131,7 @@ void NPad::ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t c auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index); - if (!data->flag.is_assigned) { + if (data == nullptr || !data->flag.is_assigned) { continue; } @@ -463,13 +463,13 @@ void NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) { std::scoped_lock lock{*applet_resource_holder.shared_mutex}; for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) { const auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index); - const auto aruid = data->aruid; - if (!data->flag.is_assigned) { + if (data == nullptr || !data->flag.is_assigned) { continue; } bool is_set{}; + const auto aruid = data->aruid; npad_resource.IsSupportedNpadStyleSet(is_set, aruid); // Wait until style is defined if (!is_set) { |