aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_macro.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-03-04 05:57:47 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-03-04 05:57:47 +0000
commit23508ac7a235b40df24103748f6085c2884bc35b (patch)
tree3498801c3bb92ec8cf740dab8cee57e7a63af2a7 /apps/app_macro.c
parentc665dd260ddfca955da82e6e32e54a3a12d5cd60 (diff)
Copy old extension unless it's ASYNCGOTO (bug #1141)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2326 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rwxr-xr-xapps/app_macro.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 6cb07bd6f..3189d077b 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -202,7 +202,7 @@ out:
/* If we're leaving the macro normally, restore original information */
chan->priority = oldpriority;
strncpy(chan->context, oldcontext, sizeof(chan->context) - 1);
- if (!chan->_softhangup) {
+ if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) {
/* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */
strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1);
if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {