diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-01 17:46:31 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-01 17:46:31 +0000 |
| commit | f3cd4a71e234db581106e8851ce95f8415ff9610 (patch) | |
| tree | 515f5fec1a6edba41bb22c0dc6e8cb1339584aaf /channels | |
| parent | 028dcc7bbd86e0558e1c222137d0dccc0d7c9819 (diff) | |
Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue.
(closes issue #16525)
Reported by: kobaz
Patches:
20100126__issue16525.diff.txt uploaded by tilghman (license 14)
20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14)
Tested by: kobaz, atis
(closes issue #16581)
Reported by: ZX81
(closes issue #16681)
Reported by: alexr1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@244070 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index e0fba1bb2..b39aeccd1 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -212,9 +212,7 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra } if (other) { - if (other->pbx || other->_bridge || !ast_strlen_zero(other->appl)) { - ast_queue_frame(other, f); - } /* else the frame won't go anywhere */ + ast_queue_frame(other, f); ast_channel_unlock(other); } |