[asterisk-commits] mnicholson: branch 1.8 r325545 - /branches/1.8/main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun 29 11:18:39 2011
New Revision: 325545

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325545
Log:
make framehooks prevent native bridging (for real this time)

Modified:
    branches/1.8/main/channel.c

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=325545&r1=325544&r2=325545
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Wed Jun 29 11:18:39 2011
@@ -7287,6 +7287,7 @@
 		    (c0->tech->bridge == c1->tech->bridge) &&
 		    !c0->monitor && !c1->monitor &&
 		    !c0->audiohooks && !c1->audiohooks &&
+		    ast_framehook_list_is_empty(c0->framehooks) && ast_framehook_list_is_empty(c1->framehooks) &&
 		    !c0->masq && !c0->masqr && !c1->masq && !c1->masqr) {
 			int timeoutms = to - 1000 > 0 ? to - 1000 : to;
 			/* Looks like they share a bridge method and nothing else is in the way */