diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-04 16:21:35 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-04 16:21:35 +0000 |
commit | 6f4e0912f72998618fbc0f8ada6e466cc8255f8a (patch) | |
tree | d42ea940b68d347babc4f5970d76f05ca55e66af /channels/chan_local.c | |
parent | 6167def90fcecdac09b91bb4dc482e9fc7777b0c (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@237321 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r-- | channels/chan_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index b674a1560..1cfe30f48 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -251,7 +251,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); |