[asterisk-commits] jpeeler: branch 1.6.2 r298597 - in /branches/1.6.2: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Dec 16 14:49:33 2010
New Revision: 298597

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298597
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_queue.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=298597&r1=298596&r2=298597
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Thu Dec 16 14:49:33 2010
@@ -3050,6 +3050,7 @@
 							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 */