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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 28efe67be759ce7b3987af341efece5f785fdc2e..18e9942b50adc23a4c27300b6dbad3aed4ff1bc5 100644 (file)
--- 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 */