[asterisk-commits] moy: trunk r196456 - /trunk/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: moy
Date: Fri May 22 23:27:47 2009
New Revision: 196456

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196456
Log:
set MFCR2_CATEGORY just when starting the pbx

Modified:
    trunk/channels/chan_dahdi.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=196456&r1=196455&r2=196456
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri May 22 23:27:47 2009
@@ -7758,10 +7758,6 @@
 	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;
 	/* Assure there is no confmute on this channel */
@@ -7776,6 +7772,11 @@
 		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);