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

Timestamp:

Nov 13, 2018 1:01:26 PM (6 years ago)

Author:

vboxsync

Message:

Audio/HDA: Don't debug assert when trying to remove a stream which is not initialized yet.

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (3 diffs)

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

@@ -1979 +1979 @@
             switch (pCfg->DestSource.Source)
             {
-                case PDMAUDIORECSOURCE_LINE: enmMixerCtl = PDMAUDIOMIXERCTL_LINE_IN; break;
+                case PDMAUDIORECSOURCE_UNKNOWN: break;
+                case PDMAUDIORECSOURCE_LINE:    enmMixerCtl = PDMAUDIOMIXERCTL_LINE_IN; break;
 # ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-                case PDMAUDIORECSOURCE_MIC:  enmMixerCtl = PDMAUDIOMIXERCTL_MIC_IN;  break;
+                case PDMAUDIORECSOURCE_MIC:     enmMixerCtl = PDMAUDIOMIXERCTL_MIC_IN;  break;
 # endif
                 default:
@@ -1997 +1998 @@
             switch (pCfg->DestSource.Dest)
             {
+                case PDMAUDIOPLAYBACKDEST_UNKNOWN:    break;
                 case PDMAUDIOPLAYBACKDEST_FRONT:      enmMixerCtl = PDMAUDIOMIXERCTL_FRONT;      break;
 # ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
@@ -2014 +2016 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (   RT_SUCCESS(rc)
+        && enmMixerCtl != PDMAUDIOMIXERCTL_UNKNOWN)
+    {
         rc = hdaCodecRemoveStream(pThis->pCodec, enmMixerCtl);
+    }
 
     LogFlowFuncLeaveRC(rc);