From: Moises Silva <moises.silva@gmail.com>
Date: Sat, 23 May 2009 04:27:47 +0000 (+0000)
Subject: set MFCR2_CATEGORY just when starting the pbx
X-Git-Tag: 11.0.0-beta1~4830
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b93c1a2df5d6efc0afa4e2d9be279e994aa4e25d;p=thirdparty%2Fasterisk.git

set MFCR2_CATEGORY just when starting the pbx

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f4b6d3acab..b3fcac294d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7757,10 +7757,6 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
 	/* Assume calls are not idle calls unless we're told differently */
 	i->isidlecall = 0;
 	i->alreadyhungup = 0;
-#endif
-#ifdef HAVE_OPENR2
-	if (i->mfcr2call)
-		pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category));
 #endif
 	/* clear the fake event in case we posted one before we had ast_channel */
 	i->fake_event = 0;
@@ -7776,6 +7772,11 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
 		pbx_builtin_setvar_helper(tmp, v->name, v->value);
 
 	if (startpbx) {
+#ifdef HAVE_OPENR2
+		if (i->mfcr2call) {
+			pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category));
+		}
+#endif
 		if (ast_pbx_start(tmp)) {
 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 			ast_hangup(tmp);