diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-14 09:58:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-14 09:58:17 -0400 |
commit | 36d18e457bfa7c178547b77c8e961b20baf1590f (patch) | |
tree | 807cbef7b7e742ca2dfd399dfc1a502f98b6e745 /src | |
parent | db562bc08dbe29e7df04aeea8bc8085d461474ba (diff) | |
parent | 68ea0a2b72e3bd0a15ce978f864b45ee84af9f9e (diff) |
Merge pull request #11778 from liamwhite/audren-shutdown-lock
audio: fix shutdown deadlock in audio renderer
Diffstat (limited to 'src')
-rw-r--r-- | src/audio_core/sink/sink_stream.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 6081352a2..d66d04fae 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -204,6 +204,10 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz // paused and we'll desync, so just play silence. if (system.IsPaused() || system.IsShuttingDown()) { if (system.IsShuttingDown()) { + { + std::scoped_lock lk{release_mutex}; + queued_buffers.store(0); + } release_cv.notify_one(); } |