aboutsummaryrefslogtreecommitdiff
path: root/src/hid_core/resources/touch_screen
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-02-06 10:24:46 -0500
committerGitHub <noreply@github.com>2024-02-06 10:24:46 -0500
commit5016de3626c771ee51f4ced0b3d7610bd6a2140e (patch)
treea096365940afbf1aa8567cd11d6f4865be5c4585 /src/hid_core/resources/touch_screen
parentd5fb9fd12cfd06503c61326e03359b43b73aefc2 (diff)
parent8f192b494ae1628a9c91007691123eb9ac9c759e (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/touch_screen')
-rw-r--r--src/hid_core/resources/touch_screen/touch_screen_resource.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp
index 56e8e8e51..c39321915 100644
--- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp
+++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp
@@ -63,7 +63,7 @@ Result TouchResource::ActivateTouch(u64 aruid) {
auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
TouchAruidData& touch_data = aruid_data[aruid_index];
- if (!applet_data->flag.is_assigned) {
+ if (applet_data == nullptr || !applet_data->flag.is_assigned) {
touch_data = {};
continue;
}
@@ -124,7 +124,7 @@ Result TouchResource::ActivateGesture(u64 aruid, u32 basic_gesture_id) {
auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
TouchAruidData& touch_data = aruid_data[aruid_index];
- if (!applet_data->flag.is_assigned) {
+ if (applet_data == nullptr || !applet_data->flag.is_assigned) {
touch_data = {};
continue;
}
@@ -324,7 +324,7 @@ Result TouchResource::SetTouchScreenConfiguration(
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
TouchAruidData& data = aruid_data[aruid_index];
- if (!applet_data->flag.is_assigned) {
+ if (applet_data == nullptr || !applet_data->flag.is_assigned) {
continue;
}
if (aruid != data.aruid) {
@@ -344,7 +344,7 @@ Result TouchResource::GetTouchScreenConfiguration(
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
const TouchAruidData& data = aruid_data[aruid_index];
- if (!applet_data->flag.is_assigned) {
+ if (applet_data == nullptr || !applet_data->flag.is_assigned) {
continue;
}
if (aruid != data.aruid) {