From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 23 May 2007 20:07:59 +0000 (+0000)
Subject: Merged revisions 65676 via svnmerge from
X-Git-Tag: 1.4.5~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f608d9028311f51037d0adb2d15a3dfa456c9ce3;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@65677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index af33defe66..10c79f31bf 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3309,6 +3309,10 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability)
 		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);
@@ -3318,9 +3322,6 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability)
 		}
 	}
 
-	for (v = i->vars ; v ; v = v->next)
-		pbx_builtin_setvar_helper(tmp, v->name, v->value);
-
 	ast_module_ref(ast_module_info->self);
 	
 	return tmp;