From: Jason Parker <jparker@digium.com>
Date: Tue, 15 Feb 2011 23:34:27 +0000 (+0000)
Subject: Merged revisions 308010 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1835
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=551dac2eda39fba3ece3feebab9a8e03c7513453;p=thirdparty%2Fasterisk.git

Merged revisions 308010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308010 | qwell | 2011-02-15 17:34:03 -0600 (Tue, 15 Feb 2011) | 24 lines

  Merged revisions 308007 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r308007 | qwell | 2011-02-15 17:33:24 -0600 (Tue, 15 Feb 2011) | 17 lines

    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: https://origsvn.digium.com/svn/asterisk/trunk@308013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index f511bfc819..5c348b7523 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3719,7 +3719,6 @@ 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 */