[asterisk-commits] kpfleming: branch 1.4 r65677 - in /branches/1.4: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 23 15:07:59 2007
New Revision: 65677

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

........
r65676 | kpfleming | 2007-05-23 16:06:13 -0400 (Wed, 23 May 2007) | 2 lines

if we are going to set variables on a newly created channel, it should be done *before* we start the PBX on it

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_iax2.c

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

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=65677&r1=65676&r2=65677
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Wed May 23 15:07:59 2007
@@ -3309,6 +3309,10 @@
 		tmp->adsicpe = AST_ADSI_UNAVAILABLE;
 	i->owner = tmp;
 	i->capability = capability;
+
+	for (v = i->vars ; v ; v = v->next)
+		pbx_builtin_setvar_helper(tmp, v->name, v->value);
+
 	if (state != AST_STATE_DOWN) {
 		if (ast_pbx_start(tmp)) {
 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
@@ -3317,9 +3321,6 @@
 			return NULL;
 		}
 	}
-
-	for (v = i->vars ; v ; v = v->next)
-		pbx_builtin_setvar_helper(tmp, v->name, v->value);
 
 	ast_module_ref(ast_module_info->self);