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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 56118fd8c144c9d1cb87f4e1bce0cc44fec98ca9..987d8da244bf95dc4d6eed8bb076b81b0de17391 100644 (file)
--- 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 */