[svn-commits] murf: branch murf/bug_7731_trunk r39838 - /team/murf/bug_7731_trunk/apps/

[svn-commits at lists.digium.com]

Author: murf
Date: Tue Aug 15 13:00:05 2006
New Revision: 39838

URL: http://svn.digium.com/view/asterisk?rev=39838&view=rev
Log:
this small change fixes a nasty bug for dialplan programmers depending on macros over 1 call deep in the 'h' extension.


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

Modified: team/murf/bug_7731_trunk/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7731_trunk/apps/app_macro.c?rev=39838&r1=39837&r2=39838&view=diff
==============================================================================
--- team/murf/bug_7731_trunk/apps/app_macro.c (original)
+++ team/murf/bug_7731_trunk/apps/app_macro.c Tue Aug 15 13:00:05 2006
@@ -254,9 +254,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++;