瀏覽代碼

pulseaudio: Stop the threaded mainloop before destroying the context.

Otherwise, we might trigger an assertion in libpulse.

Reference Issue #8348.

(cherry picked from commit 10fab3a39e2bd163cc45147b6afd517501801002)
Ryan C. Gordon 1 年之前
父節點
當前提交
d8b34b0993
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/audio/pulseaudio/SDL_pulseaudio.c

+ 3 - 1
src/audio/pulseaudio/SDL_pulseaudio.c

@@ -286,13 +286,15 @@ static void WaitForPulseOperation(pa_operation *o)
 
 static void DisconnectFromPulseServer(void)
 {
+    if (pulseaudio_threaded_mainloop != NULL) {
+        PULSEAUDIO_pa_threaded_mainloop_stop(pulseaudio_threaded_mainloop);
+    }
     if (pulseaudio_context) {
         PULSEAUDIO_pa_context_disconnect(pulseaudio_context);
         PULSEAUDIO_pa_context_unref(pulseaudio_context);
         pulseaudio_context = NULL;
     }
     if (pulseaudio_threaded_mainloop != NULL) {
-        PULSEAUDIO_pa_threaded_mainloop_stop(pulseaudio_threaded_mainloop);
         PULSEAUDIO_pa_threaded_mainloop_free(pulseaudio_threaded_mainloop);
         pulseaudio_threaded_mainloop = NULL;
     }