diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-05-07 21:47:08 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-05-07 21:47:08 +0000 |
| commit | 5394364048dd8e530d5fd8ddbdd4c46729b7727c (patch) | |
| tree | 2f5e2d2152ad75356911f6e76c4460d03da70d69 /main/channel.c | |
| parent | b6ef87dbf38ea40a20f06796e38466426460fad0 (diff) | |
Merged revisions 63286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r63286 | file | 2007-05-07 17:45:01 -0400 (Mon, 07 May 2007) | 10 lines
Merged revisions 63285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r63285 | file | 2007-05-07 17:39:52 -0400 (Mon, 07 May 2007) | 2 lines
Properly handle what happens during a masquerade in relation to group counting. (issue #9657 reported by ramonpeek)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index c92530c34..e48042793 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3575,7 +3575,7 @@ int ast_do_masquerade(struct ast_channel *original) original->fds[x] = clone->fds[x]; } - ast_app_group_discard(original); + ast_app_group_update(clone, original); /* move any whisperer over */ ast_channel_whisper_stop(original); |