[asterisk-commits] twilson: trunk r169486 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Jan 20 12:48:14 2009
New Revision: 169486

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=169486
Log:
Merged revisions 169485 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r169485 | twilson | 2009-01-20 12:40:56 -0600 (Tue, 20 Jan 2009) | 6 lines
  
  Don't play audio to the channel if we've masqueraded
  
  (closes issue #14066)
  Reported by: bluefox
  Tested by: otherwiseguy, bluefox
........

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

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

Modified: trunk/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/features.c?view=diff&rev=169486&r1=169485&r2=169486
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Jan 20 12:48:14 2009
@@ -648,7 +648,7 @@
 		*(args->extout) = x;
 
 	if (peer) 
-		ast_copy_string(pu->peername, peer->name, sizeof(pu->peername));
+		ast_copy_string(pu->peername, S_OR(args->orig_chan_name, peer->name), sizeof(pu->peername));
 
 	/* Remember what had been dialed, so that if the parking
 	   expires, we try to come back to the same place */