[asterisk-commits] tilghman: trunk r236982 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec 30 15:59:18 2009
New Revision: 236982

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

........
  r236981 | tilghman | 2009-12-30 15:57:10 -0600 (Wed, 30 Dec 2009) | 9 lines
  
  Don't queue frames to channels that have no means to process them.
  (closes issue #15609)
   Reported by: aragon
   Patches: 
         20091230__issue16521__1.4__chan_local_only.diff.txt uploaded by tilghman (license 14)
   Tested by: aragon
   
  Review: https://reviewboard.asterisk.org/r/452/
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

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

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=236982&r1=236981&r2=236982
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Wed Dec 30 15:59:18 2009
@@ -257,7 +257,9 @@
 	}
 
 	if (other) {
-		ast_queue_frame(other, f);
+		if (other->pbx || other->_bridge) {
+			ast_queue_frame(other, f);
+		} /* else the frame won't go anywhere */
 		ast_channel_unlock(other);
 	}