diff options
| author | bunnei <bunneidev@gmail.com> | 2023-06-05 21:43:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 21:43:43 -0700 |
| commit | cb95d7fe1b6d81899fe6b279400da2c991e3132c (patch) | |
| tree | a856ac45b1053009c4c11ee141c49d7faa4c8a19 /src/audio_core/sink | |
| parent | db7b106f1d9d559dadfd9ed070a8b0986609ec57 (diff) | |
| parent | 036996429e1766231c5002bb333ee4e67d216c2c (diff) | |
Merge pull request #10508 from yuzu-emu/lime
Project Lime - yuzu Android Port
Diffstat (limited to 'src/audio_core/sink')
| -rw-r--r-- | src/audio_core/sink/sink_stream.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index f44fedfd5..5d58b950c 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -273,10 +273,13 @@ void SinkStream::WaitFreeSpace(std::stop_token stop_token) { std::unique_lock lk{release_mutex}; release_cv.wait_for(lk, std::chrono::milliseconds(5), [this]() { return queued_buffers < max_queue_size; }); +#ifndef ANDROID + // This wait can cause a problematic shutdown hang on Android. if (queued_buffers > max_queue_size + 3) { Common::CondvarWait(release_cv, lk, stop_token, [this] { return queued_buffers < max_queue_size; }); } +#endif } } // namespace AudioCore::Sink |