[asterisk-commits] tilghman: branch 1.6.1 r237321 - in /branches/1.6.1: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan  4 10:21:35 2010
New Revision: 237321

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

................
  r237319 | tilghman | 2010-01-04 10:20:03 -0600 (Mon, 04 Jan 2010) | 10 lines
  
  Merged revisions 237318 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237318 | tilghman | 2010-01-04 10:18:59 -0600 (Mon, 04 Jan 2010) | 3 lines
    
    It's also possible for the Local channel to directly execute an Application.
    Reviewboard: https://reviewboard.asterisk.org/r/452/
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_local.c

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

Modified: branches/1.6.1/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=237321&r1=237320&r2=237321
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Mon Jan  4 10:21:35 2010
@@ -251,7 +251,7 @@
 	}
 
 	if (other) {
-		if (other->pbx || other->_bridge) {
+		if (other->pbx || other->_bridge || !ast_strlen_zero(other->appl)) {
 			ast_queue_frame(other, f);
 		} /* else the frame won't go anywhere */
 		ast_channel_unlock(other);