diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-01 15:39:54 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-01 15:39:54 +0000 |
| commit | b3ceaa6a9ef31d084b0eb8cfa4717cebfe9298ed (patch) | |
| tree | 8669ddf483350f2bd54e6b146d9a2a5a56e9c141 /apps/app_macro.c | |
| parent | b7bc7c5b5e8f9db94219fee0037f12d0b8a86b15 (diff) | |
Convert code that checks the _softhangup member of ast_channel directory to use
the ast_check_hangup() funciton. This function takes scheduled hangups into
account.
(closes issue #10230, patch by Juggie)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77858 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
| -rw-r--r-- | apps/app_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 9949f43c3..32e9d2d21 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -385,7 +385,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) } /* don't stop executing extensions when we're in "h" */ - if (chan->_softhangup && !inhangup) { + if (ast_check_hangup(chan) && !inhangup) { ast_debug(1, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n", chan->exten, chan->macroexten, chan->priority); goto out; } @@ -434,7 +434,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) /* If we're leaving the macro normally, restore original information */ chan->priority = oldpriority; ast_copy_string(chan->context, oldcontext, sizeof(chan->context)); - if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) { + if (!(ast_check_hangup(chan) & AST_SOFTHANGUP_ASYNCGOTO)) { /* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */ const char *offsets; ast_copy_string(chan->exten, oldexten, sizeof(chan->exten)); |