aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-16 20:49:33 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-16 20:49:33 +0000
commit9149ebebbc0e39a00819a30b21b1c653f916510f (patch)
tree9a9347e0159a4be726c05c2761263c60ec9ff252 /apps
parent6f631293a89ba473158caf00b3d08a7f6c4dc0f5 (diff)
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/branches/1.6.2@298597 f38db490-d61c-443f-a65b-d21fe96a405b
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 56118fd8c..987d8da24 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3050,6 +3050,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
break;
case AST_CONTROL_RINGING:
ast_verb(3, "%s is ringing\n", o->chan->name);
+ ast_indicate(in, AST_CONTROL_RINGING);
break;
case AST_CONTROL_OFFHOOK:
/* Ignore going off hook */