Committed a fix for 7731, suggested by mnehauser.

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

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 5adc0a0..21c2b7c 100644 (file)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -257,7 +257,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
                        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;