From: Joshua Colp <jcolp@digium.com>
Date: Tue, 11 Mar 2008 19:23:28 +0000 (+0000)
Subject: Merged revisions 107646 via svnmerge from
X-Git-Tag: 1.6.0-beta7~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b84cdbfe38d71f795c6e556494de82f603d0dc66;p=thirdparty%2Fasterisk.git

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/trunk@107659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index b4e2817319..1b6fda4b23 100644
--- a/main/features.c
+++ b/main/features.c
@@ -1113,6 +1113,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);
@@ -1209,6 +1210,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);