diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-16 20:52:19 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-16 20:52:19 +0000 |
| commit | 85316bebc301e1154e60d07048ff7ac606788904 (patch) | |
| tree | 32909d4d79eb81d634ed45a80fee5a58b948845a | |
| parent | 6fe21c64cfd085d1a3298cfbb2926f923fc7507b (diff) | |
Merged revisions 298598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r298598 | jpeeler | 2010-12-16 14:51:44 -0600 (Thu, 16 Dec 2010) | 21 lines
Merged revisions 298597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r298597 | jpeeler | 2010-12-16 14:49:33 -0600 (Thu, 16 Dec 2010) | 14 lines
Merged revisions 298596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r298596 | jpeeler | 2010-12-16 14:46:52 -0600 (Thu, 16 Dec 2010) | 7 lines
Fix improper hangup when doing an attended transfer to queue.
Had to indicate ringing in wait_for_answer so the attended transfer code would
not try and hang up the local channel it created, which would kill the call.
ABE-2624
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@298599 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_queue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 28efe67be..18e9942b5 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3558,6 +3558,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte ast_moh_stop(qe->chan); ast_indicate(qe->chan, AST_CONTROL_RINGING); } + ast_indicate(in, AST_CONTROL_RINGING); break; case AST_CONTROL_OFFHOOK: /* Ignore going off hook */ |