[asterisk-commits] mnicholson: trunk r325547 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun 29 11:19:01 2011
New Revision: 325547

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325547
Log:
Merged revisions 325545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325545 | mnicholson | 2011-06-29 11:18:39 -0500 (Wed, 29 Jun 2011) | 2 lines
  
  make framehooks prevent native bridging (for real this time)
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=325547&r1=325546&r2=325547
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Jun 29 11:19:01 2011
@@ -7499,6 +7499,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 */