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/branches/1.8@308010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index f511bfc819c37884f581de279c46f9801646c82b..5c348b7523517580fbd8c264de7431733133a225 100644 (file)
--- 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 */