diff options
| author | bunnei <bunneidev@gmail.com> | 2018-03-04 17:52:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 17:52:08 +0100 |
| commit | 3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77 (patch) | |
| tree | 43bd3a05be18765314f946958a87999bb8ae13b1 /src/core/hle | |
| parent | Merge pull request #226 from Subv/buffer_queue_event (diff) | |
| parent | CoreTiming: Unschedule the pending events when an Interface is destroyed. (diff) | |
| download | yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar.gz yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar.bz2 yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar.lz yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar.xz yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.tar.zst yuzu-3c3d5eeddf34bc52b2770df8f1c4cda1dc8e5b77.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/audio/audout_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 4 | ||||
| -rw-r--r-- | 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 780a4e6e5..e873d768f 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 dda135d18..1cbca6c4b 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 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}; |