summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2010-12-16 20:52:19 +0000
committerJeff Peeler <jpeeler@digium.com>2010-12-16 20:52:19 +0000
commit6c0b904d17db57d563db179bf849050aba6d78dc (patch)
tree32909d4d79eb81d634ed45a80fee5a58b948845a /apps
parent8ba7ff54b4f7c3359cd1baf4e2748b7ff4f4881e (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: https://origsvn.digium.com/svn/asterisk/trunk@298599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c1
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 */