[patch] Updated 10-dahdi-chanvars.patch to match new context

10-dahdi-chanvars-1.8.7.0_rc2.patch (text/plain), 1.29 KB, created by Erik Wallin on 2011-09-21 16:47:52 UTC

Patch by: Jaco Kroon <[e-mail]>
https://bugs.gentoo.org/show_bug.cgi?id=374195

diff -uNr asterisk-1.8.7.0-rc2.orig/channels/chan_dahdi.c asterisk-1.8.7.0-rc2/channels/chan_dahdi.c
--- asterisk-1.8.7.0-rc2.orig/channels/chan_dahdi.c	2011-09-19 18:57:40.000000000 +0200
+++ asterisk-1.8.7.0-rc2/channels/chan_dahdi.c	2011-09-21 15:04:00.125095744 +0200
@@ -17754,12 +17754,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) {
 		/* Process the deferred dahdichan value. */
 		if (build_channels(confp, dahdichan->value, reload, dahdichan->lineno,
@@ -17774,6 +17768,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) {