From 248881fa7fb67d3d161f6e493546de75a3746c07 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Sun, 4 Mar 2018 10:34:25 -0500
Subject: [PATCH] CoreTiming: Unschedule the pending events when an Interface
 is destroyed.

---
 src/core/hle/service/audio/audout_u.cpp | 4 +++-
 src/core/hle/service/audio/audren_u.cpp | 4 +++-
 src/core/hle/service/hid/hid.cpp        | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 780a4e6e5f..e873d768fc 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -52,7 +52,9 @@ public:
         CoreTiming::ScheduleEvent(audio_ticks, audio_event);
     }
 
-    ~IAudioOut() = default;
+    ~IAudioOut() {
+        CoreTiming::UnscheduleEvent(audio_event, 0);
+    }
 
 private:
     void StartAudioOut(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index dda135d180..1cbca6c4bb 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -45,7 +45,9 @@ public:
         // Start the audio event
         CoreTiming::ScheduleEvent(audio_ticks, audio_event);
     }
-    ~IAudioRenderer() = default;
+    ~IAudioRenderer() {
+        CoreTiming::UnscheduleEvent(audio_event, 0);
+    }
 
 private:
     void UpdateAudioCallback() {
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index dacd1862df..7e04ad8d44 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};