aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 16:21:27 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-04 16:21:27 +0000
commit12c31f9a0d35c0cfd95b601bd67d3cad1d088422 (patch)
treedc8187fcddd28c836ab3c06f81e062e6eac842da
parent47ca8fbd843150922df37bc05f3aa2f5f091b900 (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.0@237320 f38db490-d61c-443f-a65b-d21fe96a405b
-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 1c0a89c09..5b930b0ee 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);