diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-22 17:14:39 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-22 17:14:39 +0000 |
commit | 19857c026a17731bc5c711ceee5e9ed36758ffce (patch) | |
tree | 04fa8814c9b21639f12e55b511e0961882d021f5 /main | |
parent | 6a858d35cc15d74cd74bd123151018d30f3b4f7f (diff) |
Merged revisions 225360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r225360 | tilghman | 2009-10-22 12:11:23 -0500 (Thu, 22 Oct 2009) | 11 lines
Merged revisions 225105 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r225105 | tilghman | 2009-10-21 11:02:12 -0500 (Wed, 21 Oct 2009) | 4 lines
Fix documentation for ast_softhangup() and correct the misuse thereof.
(closes issue #16103)
Reported by: majorbloodnok
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@225362 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 9a01b9acf..fa8a0abf8 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3912,7 +3912,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, } if (!args || !args->no_hangup_chan) { - ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING); + ast_softhangup(c, AST_SOFTHANGUP_APPUNLOAD); } if ((!args || !args->no_hangup_chan) && |