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 0ac2d097f67e6324cce51848263624f3ffe6bd74..ece2b09b634effb1640104de9503227e8f0122ce 100644 (file)
--- 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;