aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/hid/hid.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-04 11:52:08 -0500
committerGitHub <noreply@github.com>2018-03-04 11:52:08 -0500
commit3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77 (patch)
tree43bd3a05be18765314f946958a87999bb8ae13b1 /src/core/hle/service/hid/hid.cpp
parent7e7110b3b9f466d3e3f66605d94a2fa57a7724bb (diff)
parent248881fa7fb67d3d161f6e493546de75a3746c07 (diff)
Merge pull request #228 from Subv/unschedule_events
CoreTiming: Unschedule the pending events when an Interface is destroyed
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
-rw-r--r--src/core/hle/service/hid/hid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index dacd1862d..7e04ad8d4 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -45,6 +45,10 @@ public:
CoreTiming::ScheduleEvent(pad_update_ticks, pad_update_event);
}
+ ~IAppletResource() {
+ CoreTiming::UnscheduleEvent(pad_update_event, 0);
+ }
+
private:
void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 1};