diff options
author | Franco M <francomaro@gmail.com> | 2023-11-05 01:28:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-05 01:28:16 +0100 |
commit | 728aca770317b3f86961c8669ba9ae5c68570d3f (patch) | |
tree | 29adffcb1d264cc16cacb478a8f6645ef6259b3b /src/core/hle/service/hid/controllers | |
parent | We dont need that (diff) | |
parent | Merge pull request #11952 from liamwhite/opus_stereo_count (diff) | |
download | yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar.gz yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar.bz2 yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar.lz yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar.xz yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.tar.zst yuzu-728aca770317b3f86961c8669ba9ae5c68570d3f.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/palma.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index bc822f19e..21695bda2 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -1108,9 +1108,9 @@ Result Controller_NPad::DisconnectNpad(Core::HID::NpadIdType npad_id) { shared_memory->sixaxis_dual_right_properties.raw = 0; shared_memory->sixaxis_left_properties.raw = 0; shared_memory->sixaxis_right_properties.raw = 0; - shared_memory->battery_level_dual = 0; - shared_memory->battery_level_left = 0; - shared_memory->battery_level_right = 0; + shared_memory->battery_level_dual = Core::HID::NpadBatteryLevel::Empty; + shared_memory->battery_level_left = Core::HID::NpadBatteryLevel::Empty; + shared_memory->battery_level_right = Core::HID::NpadBatteryLevel::Empty; shared_memory->fullkey_color = { .attribute = ColorAttribute::NoController, .fullkey = {}, diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/core/hle/service/hid/controllers/palma.cpp index 14c67e454..73a2a2b91 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/core/hle/service/hid/controllers/palma.cpp @@ -19,7 +19,9 @@ Controller_Palma::Controller_Palma(Core::HID::HIDCore& hid_core_, u8* raw_shared operation_complete_event = service_context.CreateEvent("hid:PalmaOperationCompleteEvent"); } -Controller_Palma::~Controller_Palma() = default; +Controller_Palma::~Controller_Palma() { + service_context.CloseEvent(operation_complete_event); +}; void Controller_Palma::OnInit() {} |