Author: janderwald
Date: Sun Nov 17 14:51:06 2013
New Revision: 61017
URL:
http://svn.reactos.org/svn/reactos?rev=61017&view=rev
Log:
- stop enumeration of mixer controls when there is more than one item
- fixes vmware audio driver hangs
- needs more work
- patch by David Quintana
CORE-7488 #resolve #comment thanks for the patch
Modified:
trunk/reactos/lib/drivers/sound/mmixer/controls.c
Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Nov 17 14:51:06
2013
@@ -513,8 +513,12 @@
/* get next nodes upstream */
MMixerGetNextNodesFromNodeIndex(MixerContext, Topology, NodeIndex, bUpStream,
&NodesCount, Nodes);
- /* assume there is a node connected */
- ASSERT(NodesCount != 0);
+ if (NodesCount != 1)
+ {
+ DPRINT("PinId %lu bInputMixer %lu bUpStream %lu NodeIndex %lu is not
connected", PinId, bInputMixer, bUpStream, NodeIndex);
+ break;
+ }
+
ASSERT(NodesCount == 1);
/* use first index */