summaryrefslogtreecommitdiff
path: root/main/pbx.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-08-01 15:39:54 +0000
committerRussell Bryant <russell@russellbryant.com>2007-08-01 15:39:54 +0000
commit4e0947c5f1f9c9583bff9f2be1b0c2810263e3e9 (patch)
tree8669ddf483350f2bd54e6b146d9a2a5a56e9c141 /main/pbx.c
parent96b96a5f72e12a5b747aa00e542b964f7312858e (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: https://origsvn.digium.com/svn/asterisk/trunk@77858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r--main/pbx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 34b3eeeb9..419523db9 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2418,7 +2418,7 @@ static int __ast_pbx_run(struct ast_channel *c)
/* If the AbsoluteTimeout is not reset to 0, we'll get an infinite loop */
c->whentohangup = 0;
c->_softhangup &= ~AST_SOFTHANGUP_TIMEOUT;
- } else if (c->_softhangup) {
+ } else if (ast_check_hangup(c)) {
ast_debug(1, "Extension %s, priority %d returned normally even though call was hung up\n",
c->exten, c->priority);
error = 1;