diff options
| author | 2023-10-14 09:58:17 -0400 | |
|---|---|---|
| committer | 2023-10-14 09:58:17 -0400 | |
| commit | 36d18e457bfa7c178547b77c8e961b20baf1590f (patch) | |
| tree | 807cbef7b7e742ca2dfd399dfc1a502f98b6e745 /src | |
| parent | Merge pull request #11775 from Kelebek1/draw_vertex_array (diff) | |
| parent | audio: fix shutdown deadlock in audio renderer (diff) | |
| download | yuzu-36d18e457bfa7c178547b77c8e961b20baf1590f.tar.gz yuzu-36d18e457bfa7c178547b77c8e961b20baf1590f.tar.xz yuzu-36d18e457bfa7c178547b77c8e961b20baf1590f.zip | |
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 | |||
| 204 | // paused and we'll desync, so just play silence. | 204 | // paused and we'll desync, so just play silence. |
| 205 | if (system.IsPaused() || system.IsShuttingDown()) { | 205 | if (system.IsPaused() || system.IsShuttingDown()) { |
| 206 | if (system.IsShuttingDown()) { | 206 | if (system.IsShuttingDown()) { |
| 207 | { | ||
| 208 | std::scoped_lock lk{release_mutex}; | ||
| 209 | queued_buffers.store(0); | ||
| 210 | } | ||
| 207 | release_cv.notify_one(); | 211 | release_cv.notify_one(); |
| 208 | } | 212 | } |
| 209 | 213 | ||