[asterisk-commits] bweschke: trunk r41883 - in /trunk: ./ apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Sun Sep  3 12:40:08 2006
New Revision: 41883

URL: http://svn.digium.com/view/asterisk?rev=41883&view=rev
Log:
Merged revisions 41882 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r41882 | bweschke | 2006-09-03 13:38:22 -0400 (Sun, 03 Sep 2006) | 3 lines

 Make sure the forwarded channel inherits variables appropriately when we receive a call forward in the queue. (#7867 - raarts reported and patched)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

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

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=41883&r1=41882&r2=41883&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Sun Sep  3 12:40:08 2006
@@ -1919,6 +1919,7 @@
 						o->stillgoing = 0;
 						numnochan++;
 					} else {
+						ast_channel_inherit_variables(in, o->chan);
 						if (o->chan->cid.cid_num)
 							free(o->chan->cid.cid_num);
 						o->chan->cid.cid_num = ast_strdup(in->cid.cid_num);