[patch] ast-1.8.5.0-chan_dahdi-chanvars.patch

ast-1.8.5.0-chan_dahdi-chanvars.patch (text/plain), 1.07 KB, created by Jaco Kroon on 2011-07-22 13:03:17 UTC

--- asterisk-1.8.5.0/channels/chan_dahdi.c.orig	2011-07-22 14:55:58.000000000 +0200
+++ asterisk-1.8.5.0/channels/chan_dahdi.c	2011-07-22 14:56:21.000000000 +0200
@@ -17624,12 +17624,6 @@
 			ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);
 	}
 
-	/* Since confp has already filled invidual dahdi_pvt objects with channels at this point, clear the variables in confp's pvt. */
-	if (confp->chan.vars) {
-		ast_variables_destroy(confp->chan.vars);
-		confp->chan.vars = NULL;
-	}
-
 	if (dahdichan[0]) {
 		/* The user has set 'dahdichan' */
 		/*< \todo pass proper line number instead of 0 */
@@ -17638,6 +17632,12 @@
 		}
 	}
 
+	/* Since confp has already filled invidual dahdi_pvt objects with channels at this point, clear the variables in confp's pvt. */
+	if (confp->chan.vars) {
+		ast_variables_destroy(confp->chan.vars);
+		confp->chan.vars = NULL;
+	}
+
 	/* mark the first channels of each DAHDI span to watch for their span alarms */
 	for (tmp = iflist, y=-1; tmp; tmp = tmp->next) {
 		if (!tmp->destroy && tmp->span != y) {