[asterisk-commits] [svn-commits] file: branch file/bridging r106325 - /team/file/bridging/main/bridging.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Mar  5 21:35:35 2008
New Revision: 106325

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106325
Log:
Minor change. It is possible for the channel to no longer exist so let ast_bridge_depart do our detective work to see whether it does or not.

Modified:
    team/file/bridging/main/bridging.c

Modified: team/file/bridging/main/bridging.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/bridging.c?view=diff&rev=106325&r1=106324&r2=106325
==============================================================================
--- team/file/bridging/main/bridging.c (original)
+++ team/file/bridging/main/bridging.c Wed Mar  5 21:35:35 2008
@@ -1360,13 +1360,13 @@
 	ast_bridge_features_cleanup(&features);
 
 	/* Drop the channel we are transferring to out of the above bridge since it has ended */
-	ast_bridge_depart(attended_bridge, chan);
+	if (!ast_bridge_depart(attended_bridge, chan)) {
+		/* Just like in a blind transfer we impart this new channel upon the bridge in our place, once done we will be a goner */
+		ast_bridge_impart(bridge, chan, bridge_channel->chan, NULL);
+	}
 
 	/* Now that all channels are out of it we can destroy the bridge */
 	ast_bridge_destroy(attended_bridge);
-
-	/* Just like in a blind transfer we impart this new channel upon the bridge in our place, once done we will be a goner */
-	ast_bridge_impart(bridge, chan, bridge_channel->chan, NULL);
 
 	return 0;
 }


_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/svn-commits