Changeset 87856 in vbox

Timestamp:

Feb 24, 2021 8:35:35 AM (4 years ago)

Author:

vboxsync

Message:

Audio/Mixer: Follow-up fix for r142918; first destroy the sink, then de-associate it from the mixer.

File:

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

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

@@ -323 +323 @@
         PAUDMIXSINK pSinkToRemove = pSink;
 
+        audioMixerSinkDestroyInternal(pSinkToRemove);
         audioMixerRemoveSinkInternal(pMixer, pSinkToRemove);
 
-        audioMixerSinkDestroyInternal(pSinkToRemove);
-
         RTMemFree(pSinkToRemove);
     }
 
-    pMixer->cSinks = 0;
+    Assert(pMixer->cSinks == 0);
 
     if (pMixer->pszName)
@@ -917 +916 @@
     }
 
-    if (pSink->pParent->fFlags & AUDMIXER_FLAGS_DEBUG)
+    if (   pSink->pParent
+        && pSink->pParent->fFlags & AUDMIXER_FLAGS_DEBUG)
     {
         DrvAudioHlpFileDestroy(pSink->Dbg.pFile);