diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 17:11:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 17:11:03 +0000 |
| commit | 428ee3816c48dc52e628bdeedcf738b08e4f0a83 (patch) | |
| tree | 51cfac63118bbfdd510bef3ebe7a8c7e44c52f5b | |
| parent | 6d45bcf92b0b201dcb9d6c653c502a966dc34881 (diff) | |
Merged revisions 235822 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r235822 | tilghman | 2009-12-21 11:00:46 -0600 (Mon, 21 Dec 2009) | 15 lines
Merged revisions 235821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r235821 | tilghman | 2009-12-21 10:45:03 -0600 (Mon, 21 Dec 2009) | 8 lines
Send parking lot announcement to the channel which parked the call, not the park-ee.
(closes issue #16234)
Reported by: yeshuawatso
Patches:
20091210__issue16234.diff.txt uploaded by tilghman (license 14)
20091221__issue16234__1.4.diff.txt uploaded by tilghman (license 14)
Tested by: yeshuawatso
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@235824 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 74c20d278..58ee55c1e 100644 --- a/main/features.c +++ b/main/features.c @@ -430,7 +430,7 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan) /* Lock parking lot */ AST_LIST_LOCK(&parkinglot); /* Check for channel variable PARKINGEXTEN */ - parkingexten = pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"); + parkingexten = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"), "")); if (!ast_strlen_zero(parkingexten)) { /*!\note The API forces us to specify a numeric parking slot, even * though the architecture would tend to support non-numeric extensions @@ -649,7 +649,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i } if (!play_announcement && !orig_chan_name) { - orig_chan_name = ast_strdupa(chan->name); + orig_chan_name = ast_strdupa(peer->name); } park_status = park_call_full(chan, peer, timeout, extout, orig_chan_name, pu); |