aboutsummaryrefslogtreecommitdiff
path: root/src/hid_core/resources/npad/npad_resource.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-01-06 21:51:22 -0500
committerGitHub <noreply@github.com>2024-01-06 21:51:22 -0500
commit71fbc87dbd1d828dd6e008a2d397d5733843b124 (patch)
tree80bc1dbba75b26c38630f9db81f218dee6c8a71b /src/hid_core/resources/npad/npad_resource.cpp
parent12fd2ae86d78c69d5bce6ab5b5ba26a4b265ac92 (diff)
parentedfbf363def14dcd4e3e12b53d823ebb21bc4fee (diff)
Merge pull request #12593 from german77/pending-delete
service: hid: Handle pending delete
Diffstat (limited to 'src/hid_core/resources/npad/npad_resource.cpp')
-rw-r--r--src/hid_core/resources/npad/npad_resource.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/hid_core/resources/npad/npad_resource.cpp b/src/hid_core/resources/npad/npad_resource.cpp
index b0255a05c..ea9fc14ed 100644
--- a/src/hid_core/resources/npad/npad_resource.cpp
+++ b/src/hid_core/resources/npad/npad_resource.cpp
@@ -46,7 +46,9 @@ Result NPadResource::RegisterAppletResourceUserId(u64 aruid) {
data_index = i;
break;
}
- if (registration_list.flag[i] == RegistrationStatus::None) {
+ // TODO: Don't Handle pending delete here
+ if (registration_list.flag[i] == RegistrationStatus::None ||
+ registration_list.flag[i] == RegistrationStatus::PendingDelete) {
data_index = i;
break;
}