[asterisk-commits] dvossel: trunk r294046 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Nov  5 10:26:01 2010
New Revision: 294046

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294046
Log:
Merged revisions 293924 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293924 | dvossel | 2010-11-04 16:39:51 -0500 (Thu, 04 Nov 2010) | 4 lines
  
  Fixes ringback tone on sip semi-attended transfer.
  
  ABE-2168
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=294046&r1=294045&r2=294046
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Nov  5 10:26:01 2010
@@ -21939,6 +21939,10 @@
 
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
 
+		if (current->chan2 && current->chan2->_state == AST_STATE_RING) {
+			ast_indicate(target.chan1, AST_CONTROL_RINGING);
+		}
+
 		if (target.chan2) {
 			ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee, NULL);
 			ast_channel_queue_connected_line_update(target.chan2, &connected_to_target, NULL);