diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-08-01 15:39:54 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-08-01 15:39:54 +0000 |
commit | 4e0947c5f1f9c9583bff9f2be1b0c2810263e3e9 (patch) | |
tree | 8669ddf483350f2bd54e6b146d9a2a5a56e9c141 /apps/app_dial.c | |
parent | 96b96a5f72e12a5b747aa00e542b964f7312858e (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 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 8fd479f22..c7928116a 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1789,7 +1789,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP); /* set it back the way it was */ } if (res != AST_PBX_NO_HANGUP_PEER) { - if (!chan->_softhangup) + if (!ast_check_hangup(chan)) chan->hangupcause = peer->hangupcause; ast_hangup(peer); } @@ -1808,7 +1808,7 @@ out: senddialendevent(chan, pa.status); ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status); - if ((ast_test_flag64(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) { + if ((ast_test_flag64(peerflags, OPT_GO_ON)) && !ast_check_hangup(chan) && (res != AST_PBX_KEEPALIVE)) { if (calldurationlimit) chan->whentohangup = 0; res = 0; |