Merge branch 'nx2' into fix/vfs-open-file-limit

1 files changed, 4 insertions, 1 deletions

diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp
index b7675ff5de..2e3e741d3e 100644
--- a/src/audio_core/renderer/system.cpp
+++ b/src/audio_core/renderer/system.cpp
@@ -444,7 +444,10 @@ void System::Stop() {
     }
 
     if (execution_mode == ExecutionMode::Auto) {
-        terminate_event.Wait();
+        // The system manager thread signals this; it may already be gone during shutdown.
+        if (!terminate_event.WaitFor(std::chrono::seconds(1))) {
+            LOG_WARNING(Service_Audio, "Timed out waiting for the renderer to terminate");
+        }
     }
 }