From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 4 Jan 2010 16:21:27 +0000 (+0000)
Subject: Merged revisions 237319 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4df8feda18585b26c569e74d373d86d46a97ee87;p=thirdparty%2Fasterisk.git

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/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@237320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 1c0a89c09d..5b930b0ee3 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -217,7 +217,7 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
 	}
 
 	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);