[asterisk-commits] murf: branch murf/bug_7731_12 r39910 - /team/murf/bug_7731_12/apps/app_macro.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Aug 15 16:46:36 2006
New Revision: 39910

URL: http://svn.digium.com/view/asterisk?rev=39910&view=rev
Log:
Folded in these changes, already committed to trunk


Modified:
    team/murf/bug_7731_12/apps/app_macro.c

Modified: team/murf/bug_7731_12/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7731_12/apps/app_macro.c?rev=39910&r1=39909&r2=39910&view=diff
==============================================================================
--- team/murf/bug_7731_12/apps/app_macro.c (original)
+++ team/murf/bug_7731_12/apps/app_macro.c Tue Aug 15 16:46:36 2006
@@ -127,7 +127,7 @@
 		depth = 0;
 	}
 
-	if (depth >= 7) {
+	if (depth >= 20) {
 		ast_log(LOG_ERROR, "Macro():  possible infinite loop detected.  Returning early.\n");
 		LOCAL_USER_REMOVE(u);
 		return 0;
@@ -241,9 +241,9 @@
 			break;
 		}
 		/* don't stop executing extensions when we're in "h" */
-		if (chan->_softhangup && strcasecmp(oldexten,"h")) {
-			ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
-				chan->exten, chan->priority);
+		if (chan->_softhangup && strcasecmp(chan->macroexten,"h")) {
+			ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n",
+				chan->exten, chan->macroexten, chan->priority);
 			goto out;
 		}
 		chan->priority++;