[asterisk-commits] twilson: branch 1.6.1 r169488 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Jan 20 13:01:06 2009
New Revision: 169488

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

................
  r169486 | twilson | 2009-01-20 12:48:14 -0600 (Tue, 20 Jan 2009) | 13 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=169488&r1=169487&r2=169488
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Tue Jan 20 13:01:06 2009
@@ -581,7 +581,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 */