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

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Feb 19 18:20:35 2013
New Revision: 381815

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381815
Log:
Fix bridge_channel action queue handling of external suspended channels.

Modified:
    team/rmudgett/bridge_phase/main/bridging.c

Modified: team/rmudgett/bridge_phase/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/bridging.c?view=diff&rev=381815&r1=381814&r2=381815
==============================================================================
--- team/rmudgett/bridge_phase/main/bridging.c (original)
+++ team/rmudgett/bridge_phase/main/bridging.c Tue Feb 19 18:20:35 2013
@@ -1358,7 +1358,11 @@
 		/* Run any queued actions on the channel. */
 		ao2_lock(bridge_channel);
 		while (bridge_channel->state == AST_BRIDGE_CHANNEL_STATE_WAIT
-			&& (action = AST_LIST_REMOVE_HEAD(&bridge_channel->action_queue, frame_list))) {
+			&& !bridge_channel->suspended) {
+			action = AST_LIST_REMOVE_HEAD(&bridge_channel->action_queue, frame_list);
+			if (!action) {
+				break;
+			}
 			ao2_unlock(bridge_channel);
 			switch (action->frametype) {
 			case AST_FRAME_BRIDGE_ACTION: