diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-30 22:00:26 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-30 22:00:26 +0000 |
| commit | 5a0c800e6c3a09d89dd20d84ba1a211cd44d34d8 (patch) | |
| tree | f42469c184eec078d33d5655c602a87c61e143e4 /channels | |
| parent | 59d98f356cc8f574af29a6384e94fb6947a303c9 (diff) | |
Merged revisions 236982 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r236982 | tilghman | 2009-12-30 15:59:18 -0600 (Wed, 30 Dec 2009) | 16 lines
Merged revisions 236981 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r236981 | tilghman | 2009-12-30 15:57:10 -0600 (Wed, 30 Dec 2009) | 9 lines
Don't queue frames to channels that have no means to process them.
(closes issue #15609)
Reported by: aragon
Patches:
20091230__issue16521__1.4__chan_local_only.diff.txt uploaded by tilghman (license 14)
Tested by: aragon
Review: https://reviewboard.asterisk.org/r/452/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@236983 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 7c8aa8d75..1c0a89c09 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -217,7 +217,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra } if (other) { - ast_queue_frame(other, f); + if (other->pbx || other->_bridge) { + ast_queue_frame(other, f); + } /* else the frame won't go anywhere */ ast_channel_unlock(other); } |