[asterisk-commits] russell: branch 1.6.0 r108355 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Mar 12 17:53:24 2008
New Revision: 108355

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

........
r107465 | file | 2008-03-11 10:05:17 -0500 (Tue, 11 Mar 2008) | 4 lines

Clarify comment about masquerading and playback of the parking slot.
(closes issue #12180)
Reported by: davidw

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

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

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=108355&r1=108354&r2=108355
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Wed Mar 12 17:53:24 2008
@@ -495,7 +495,7 @@
 		ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con);
 	/* Tell the peer channel the number of the parking space */
 	if (peer && ((pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || !strcasecmp(peer->name, orig_chan_name))) { /* Only say number if it's a number and the channel hasn't been masqueraded away */
-		/* Make sure we don't start saying digits to the channel being parked */
+		/* If a channel is masqueraded into peer while playing back the parking slot number do not continue playing it back. This is the case if an attended transfer occurs. */
 		ast_set_flag(peer, AST_FLAG_MASQ_NOSTREAM);
 		ast_say_digits(peer, pu->parkingnum, "", peer->language);
 		ast_clear_flag(peer, AST_FLAG_MASQ_NOSTREAM);