[asterisk-commits] file: branch file/bridge_native r388163 - /team/file/bridge_native/bridges/

[SVN commits to the Asterisk project]

Author: file
Date: Thu May  9 06:00:47 2013
New Revision: 388163

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388163
Log:
Channel may not be in the bridge when frame hook is called.

Modified:
    team/file/bridge_native/bridges/bridge_native_rtp.c

Modified: team/file/bridge_native/bridges/bridge_native_rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/file/bridge_native/bridges/bridge_native_rtp.c?view=diff&rev=388163&r1=388162&r2=388163
==============================================================================
--- team/file/bridge_native/bridges/bridge_native_rtp.c (original)
+++ team/file/bridge_native/bridges/bridge_native_rtp.c Thu May  9 06:00:47 2013
@@ -67,7 +67,8 @@
 	/* It's safe for NULL to be passed to both of these, bridge_channel isn't used at all */
 	if (f->subclass.integer == AST_CONTROL_HOLD) {
 		native_rtp_bridge_leave(ast_channel_internal_bridge(chan), NULL);
-	} else if ((f->subclass.integer == AST_CONTROL_UNHOLD) || (f->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) {
+	} else if (((f->subclass.integer == AST_CONTROL_UNHOLD) || (f->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) &&
+		ast_channel_is_bridged(chan)) {
 		native_rtp_bridge_join(ast_channel_internal_bridge(chan), NULL);
 	}