[svn-commits] rmudgett: branch rmudgett/bridge_phase r381814 - /team/rmudgett/bridge_phase/...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Feb 19 18:19:44 2013
New Revision: 381814

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381814
Log:
bridge_multiplexed: Fix join/leave of suspended channels.

Modified:
    team/rmudgett/bridge_phase/bridges/bridge_multiplexed.c

Modified: team/rmudgett/bridge_phase/bridges/bridge_multiplexed.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/bridges/bridge_multiplexed.c?view=diff&rev=381814&r1=381813&r2=381814
==============================================================================
--- team/rmudgett/bridge_phase/bridges/bridge_multiplexed.c (original)
+++ team/rmudgett/bridge_phase/bridges/bridge_multiplexed.c Tue Feb 19 18:19:44 2013
@@ -402,7 +402,9 @@
 
 	ast_debug(1, "Adding channel '%s' to multiplexed thread '%p' for monitoring\n", ast_channel_name(bridge_channel->chan), muxed_thread);
 
-	multiplexed_chan_add(muxed_thread, bridge_channel->chan);
+	if (!bridge_channel->suspended) {
+		multiplexed_chan_add(muxed_thread, bridge_channel->chan);
+	}
 
 	/* If the second channel has not yet joined do not make things compatible */
 	if (c0 == c1) {
@@ -425,7 +427,9 @@
 
 	ast_debug(1, "Removing channel '%s' from multiplexed thread '%p'\n", ast_channel_name(bridge_channel->chan), muxed_thread);
 
-	multiplexed_chan_remove(muxed_thread, bridge_channel->chan);
+	if (!bridge_channel->suspended) {
+		multiplexed_chan_remove(muxed_thread, bridge_channel->chan);
+	}
 }
 
 /*! \brief Suspend function which means control of the channel is going elsewhere */