From 2fb8519c529d08f1f6d816b0520be36ddc7ba02d Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Mon, 6 Oct 2008 22:09:06 +0000 Subject: [PATCH] Merged revisions 146877 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r146877 | jpeeler | 2008-10-06 17:08:40 -0500 (Mon, 06 Oct 2008) | 1 line fix some comment placement ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146878 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/features.c b/main/features.c index 20023dabfb..47d79e42b8 100644 --- a/main/features.c +++ b/main/features.c @@ -627,10 +627,11 @@ static int ast_park_call_full(struct ast_channel *chan, struct ast_channel *peer con = ast_context_find_or_create(NULL, NULL, parkinglot->parking_con, registrar); if (!con) /* Still no context? Bad */ ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parkinglot->parking_con); - /* Tell the peer channel the number of the parking space */ - if (peer && !ast_test_flag(args, AST_PARK_OPT_SILENCE) && (ast_strlen_zero(args->orig_chan_name) || !strcasecmp(peer->name, args->orig_chan_name))) { /* Only say number if it's a number and the channel hasn't been masqueraded away */ + /* Only say number if it's a number and the channel hasn't been masqueraded away */ + if (peer && !ast_test_flag(args, AST_PARK_OPT_SILENCE) && (ast_strlen_zero(args->orig_chan_name) || !strcasecmp(peer->name, args->orig_chan_name))) { /* 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); + /* Tell the peer channel the number of the parking space */ ast_say_digits(peer, pu->parkingnum, "", peer->language); ast_clear_flag(peer, AST_FLAG_MASQ_NOSTREAM); }