Merged revisions 107659 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r107659 | file | 2008-03-11 16:23:28 -0300 (Tue, 11 Mar 2008) | 12 lines

Merged revisions 107646 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107646 | file | 2008-03-11 16:20:01 -0300 (Tue, 11 Mar 2008) | 4 lines

Make sure the visible indication is on the right channel so when the masquerade happens the proper indication is enacted.
(closes issue #11707)
Reported by: iam

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Joshua Colp 17 years ago
parent aad2069958
commit a241dd0b5d

@ -1115,6 +1115,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
return -1;
}
/* Make formats okay */
xferchan->visible_indication = transferer->visible_indication;
xferchan->readformat = transferee->readformat;
xferchan->writeformat = transferee->writeformat;
ast_channel_masquerade(xferchan, transferee);
@ -1211,6 +1212,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
return -1;
}
/* Make formats okay */
xferchan->visible_indication = transferer->visible_indication;
xferchan->readformat = transferee->readformat;
xferchan->writeformat = transferee->writeformat;
ast_channel_masquerade(xferchan, transferee);

Loading…
Cancel
Save