aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormaufeat <sahyno1996@gmail.com>2026-03-27 23:32:51 +0100
committercrueter <crueter@eden-emu.dev>2026-03-27 23:32:51 +0100
commitc984c387d7e337888dd094aec95c2f2477b8996d (patch)
tree8cb1b12a4b38fc935294517f1bca1dc74d85f8d3 /src
parent5856beac5480e015b223a032a8b4b3ac50e873f3 (diff)
[hid] shared memory crashes (#3784)
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3784 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: Lizzie <lizzie@eden-emu.dev> Co-authored-by: maufeat <sahyno1996@gmail.com> Co-committed-by: maufeat <sahyno1996@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/hid_core/resources/npad/npad.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index 9355a88c4b..d625617bd5 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -800,6 +800,10 @@ Result NPad::DisconnectNpad(u64 aruid, Core::HID::NpadIdType npad_id) {
auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
auto* shared_memory = controller.shared_memory;
+ if (!shared_memory) {
+ LOG_WARNING(Service_HID, "DisconnectNpad: shared_memory is null for npad_id={}", npad_id);
+ return ResultSuccess;
+ }
// Don't reset shared_memory->assignment_mode this value is persistent
shared_memory->style_tag.raw = Core::HID::NpadStyleSet::None; // Zero out
shared_memory->device_type.raw = 0;