[patch] chan_dahdi-users.conf_setvar.patch

chan_dahdi-users.conf_setvar.patch (text/plain), 1.07 KB, created by Jaco Kroon on 2011-07-06 01:21:33 UTC

--- asterisk-1.6.2.19/channels/chan_dahdi.c.orig	2011-07-06 02:56:47.000000000 +0200
+++ asterisk-1.6.2.19/channels/chan_dahdi.c	2011-07-06 02:57:10.000000000 +0200
@@ -18119,12 +18119,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 */
@@ -18132,6 +18126,13 @@
 			return -1;
 		}
 	}
+
+	/* 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;
+	}
+
 	/*< \todo why check for the pseudo in the per-channel section.
 	 * Any actual use for manual setup of the pseudo channel? */
 	if (!found_pseudo && reload != 1) {