diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-20 19:01:06 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-20 19:01:06 +0000 |
| commit | 2f6ee42dfe5371d81e948c50a674d671d458f321 (patch) | |
| tree | 863ddc3d732665726f3438231b681404c5c0435a | |
| parent | 378ad8fac0d7c4ce262001c92f41c746570416dd (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169488 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index d959b0d6b..f45ec4754 100644 --- a/main/features.c +++ b/main/features.c @@ -581,7 +581,7 @@ static int ast_park_call_full(struct ast_channel *chan, struct ast_channel *peer *(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 */ |