aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 16:21:45 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 16:21:45 +0000
commit62f2ec307522eec09792d1607303477bae322ac9 (patch)
treeb7de1d8a933d2fabae2f42b35c95bc84893615c9 /channels
parentf5fb15c55caba44933a7611b4f77884692209366 (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.2@237322 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_local.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 436226bef..7e7914ecb 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);