Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

Merge pull request #10508 from yuzu-emu/lime

bunnei31ad92b2870f
diff --cc src/audio_core/sink/sink_stream.cpp
index f44fedfd5e,b408fca896..5d58b950cc
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@@@ -273,10 -273,12 +273,13 @@@ void SinkStream::WaitFreeSpace(std::sto
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) {
- release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; });
+ Common::CondvarWait(release_cv, lk, stop_token,
+ [this] { return queued_buffers < max_queue_size; });
}
+ #endif
}
} // namespace AudioCore::Sink