[svn-commits] moy: branch 1.6.2 r196487 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: moy
Date: Sat May 23 00:29:33 2009
New Revision: 196487

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196487
Log:
Merged revisions 196456 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196456 | moy | 2009-05-22 23:27:47 -0500 (Fri, 22 May 2009) | 1 line
  
  set MFCR2_CATEGORY just when starting the pbx
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=196487&r1=196486&r2=196487
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Sat May 23 00:29:33 2009
@@ -7519,10 +7519,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 */
@@ -7537,6 +7533,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);