From: Steve Murphy <murf@digium.com>
Date: Mon, 28 Aug 2006 19:06:55 +0000 (+0000)
Subject: According to a note added to 7731 by mneuhauser, this
X-Git-Tag: 1.2.12~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6daea8e8fb22a5d1180e4371161640ed7082c8b6;p=thirdparty%2Fasterisk.git

According to a note added to 7731 by mneuhauser, this
will repair a break caused by the last fix (7731).



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

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 0ac2d097f6..ece2b09b63 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -246,7 +246,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
 			break;
 		}
 		/* don't stop executing extensions when we're in "h" */
-		if (chan->_softhangup && strcasecmp(chan->macroexten,"h")) {
+		if (chan->_softhangup && strcasecmp(oldexten,"h") && 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;