aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-28 21:02:56 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-28 21:02:56 +0000
commitfa300e38a47f5cc7877e07e254a54e4a45e919cd (patch)
tree79df0d15d915845f85de171627951f1efc0330e3 /apps
parent5ed744093a12a270ce304cf3d88a733e7e90ddd1 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41258 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_macro.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 0ac2d097f..ece2b09b6 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;