[svn-commits] rmudgett: trunk r287898 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Sep 21 10:54:12 2010
New Revision: 287898

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

........
  r287897 | rmudgett | 2010-09-21 10:53:19 -0500 (Tue, 21 Sep 2010) | 1 line
  
  Cut-n-paste error in builtin_blindtransfer().
........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=287898&r1=287897&r2=287898
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Sep 21 10:54:12 2010
@@ -1760,7 +1760,7 @@
 			ast_set_flag(transferee, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
 			ast_log(LOG_DEBUG,"ABOUT TO AST_ASYNC_GOTO, have a pbx... set HANGUP_DONT on chan=%s\n", transferee->name);
 			if (ast_channel_connected_line_macro(transferee, transferer, &transferer->connected, 1, 0)) {
-				ast_channel_update_connected_line(transferee, &transferer->connected, NULL);
+				ast_channel_update_connected_line(transferer, &transferer->connected, NULL);
 			}
 			set_c_e_p(transferee, transferer_real_context, xferto, 0);
 		}