Merge pull request #10508 from yuzu-emu/lime

Project Lime - yuzu Android Port
This commit is contained in:
bunnei
2023-06-05 21:43:43 -07:00
committed by GitHub
339 changed files with 21731 additions and 188 deletions

View File

@ -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