Changeset 85449 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jul 24, 2020 7:11:33 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139494

Message:

Audio/DrvHostPulseAudio: Don't access the context anymore when waiting for it to become ready failed for some reason

File:

• trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp

@@ -715 +715 @@
 
             rc = RTSemEventWait(hEvtInit, RT_MS_10SEC); /* 10 seconds should be plenty. */
-
-            pa_threaded_mainloop_lock(pThis->pMainLoop);
-            fLocked = true;
-
-            pa_context_state_t cstate = pa_context_get_state(pThis->pContext);
-            if (cstate != PA_CONTEXT_READY)
+            if (RT_SUCCESS(rc))
             {
-                LogRel(("PulseAudio: Failed to initialize context (state %d, rc=%Rrc)\n", cstate, rc));
-                if (RT_SUCCESS(rc))
-                    rc = VERR_AUDIO_BACKEND_INIT_FAILED;
+                pa_threaded_mainloop_lock(pThis->pMainLoop);
+                fLocked = true;
+
+                pa_context_state_t cstate = pa_context_get_state(pThis->pContext);
+                if (cstate != PA_CONTEXT_READY)
+                {
+                    LogRel(("PulseAudio: Failed to initialize context (state %d, rc=%Rrc)\n", cstate, rc));
+                    if (RT_SUCCESS(rc))
+                        rc = VERR_AUDIO_BACKEND_INIT_FAILED;
+                }
+                else
+                {
+                    /* Install the main state changed callback to know if something happens to our acquired context. */
+                    pa_context_set_state_callback(pThis->pContext, paContextCbStateChanged, pThis /* pvUserData */);
+                }
             }
+            else
+                LogRel(("PulseAudio: Waiting for context to become ready failed with %Rrc\n", rc));
         }
         else
@@ -732 +741 @@
 
         RTSemEventDestroy(hEvtInit);
-
-        /* Install the main state changed callback to know if something happens to our acquired context. */
-        pa_context_set_state_callback(pThis->pContext, paContextCbStateChanged, pThis /* pvUserData */);
     }
     while (0);