[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r383123 - /team/rmudgett/bridge_phase/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Mar 14 20:25:21 2013
New Revision: 383123

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383123
Log:
Reject a merge if either bridge is dissolved.  Fix a comment header.

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=383123&r1=383122&r2=383123
==============================================================================
--- team/rmudgett/bridge_phase/main/bridging.c (original)
+++ team/rmudgett/bridge_phase/main/bridging.c Thu Mar 14 20:25:21 2013
@@ -264,8 +264,7 @@
  * \param bridge What to queue the action on.
  * \param action What to do.
  *
- * \retval 0 on success.
- * \retval -1 on error.
+ * \return Nothing
  */
 static void ast_bridge_queue_action_nodup(struct ast_bridge *bridge, struct ast_frame *action)
 {
@@ -2441,8 +2440,8 @@
 		sched_yield();
 	}
 
-	if (bridge1->dissolved) {
-		ast_debug(1, "Can't merge bridge %p into bridge %p, destination bridge is dissolved.\n",
+	if (bridge1->dissolved || bridge2->dissolved) {
+		ast_debug(1, "Can't merge bridge %p into bridge %p, one or both bridges are dissolved.\n",
 			bridge2, bridge1);
 	} else if (bridge1->inhibit_merge || bridge2->inhibit_merge
 		|| ast_test_flag(&bridge1->feature_flags, AST_BRIDGE_FLAG_MASQUERADE_ONLY | AST_BRIDGE_FLAG_MERGE_INHIBIT_TO)