[svn-commits] file: trunk r107659 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Mar 11 14:23:28 2008
New Revision: 107659

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107659
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svn.digium.com/view/asterisk/trunk/main/features.c?view=diff&rev=107659&r1=107658&r2=107659
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Mar 11 14:23:28 2008
@@ -1113,6 +1113,7 @@
 			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 @@
 			return -1;
 		}
 		/* Make formats okay */
+		xferchan->visible_indication = transferer->visible_indication;
 		xferchan->readformat = transferee->readformat;
 		xferchan->writeformat = transferee->writeformat;
 		ast_channel_masquerade(xferchan, transferee);