diff options
| author | Mark Michelson <mmichelson@digium.com> | 2009-04-08 00:01:49 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2009-04-08 00:01:49 +0000 |
| commit | 21dd1855128739289b53fdbc4d78966caf7480e8 (patch) | |
| tree | 662898ba93cbf69a2543582bc38041700cfd54bf /channels | |
| parent | 630bf109bb3a924e90804cce697b29f2a90d9bd8 (diff) | |
Fix bad merge from fix for issue 13867.
(closes issue #14686)
Reported by: davidw
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@186837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5b66b936e..e4eda2828 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5111,11 +5111,9 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout) res = update_call_counter(p, INC_CALL_RINGING); if (res == -1) { - return res; - } else { ast->hangupcause = AST_CAUSE_USER_BUSY; + return res; } - p->callingpres = ast->cid.cid_pres; p->jointcapability = ast_translate_available_formats(p->capability, p->prefcodec); p->jointnoncodeccapability = p->noncodeccapability; |