aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-15 23:33:24 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-15 23:33:24 +0000
commit82df1513c18ac024a01efcbcc30d8652b5af0b28 (patch)
treeb7cce2eab045ce1b9b2ad6bfa66073869fc4dfeb /apps
parent32fe9128168f1253ca5aaa67ed5d7a30327ff313 (diff)
Merged revisions 308002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r308002 | qwell | 2011-02-15 17:32:20 -0600 (Tue, 15 Feb 2011) | 10 lines Fix regression that changed behavior of queues when ringing a queue member. This reverts r298596, which was to fix a highly bizarre and contrived issue with a queue member that called into his own queue being transferred back into his own queue. I couldn't reproduce that issue in any way. I think one of the other recent transfer fixes actually fixed this. (closes issue #18747) Reported by: vrban ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@308007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 6e940f789..a7f55ac73 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3053,7 +3053,6 @@ 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 */