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/branches/1.8@298598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-12-16 20:51:44 +00:00
parent 5bc2e04ec0
commit b064838468

View File

@@ -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 */