[svn-commits] tilghman: branch 1.6.0 r236983 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec 30 16:00:26 2009
New Revision: 236983

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

................
  r236982 | tilghman | 2009-12-30 15:59:18 -0600 (Wed, 30 Dec 2009) | 16 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=236983&r1=236982&r2=236983
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Wed Dec 30 16:00:26 2009
@@ -217,7 +217,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);
 	}