[svn-commits] jpeeler: trunk r298599 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Dec 16 14:52:19 2010
New Revision: 298599

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=298599&r1=298598&r2=298599
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Dec 16 14:52:19 2010
@@ -3558,6 +3558,7 @@
 								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 */