From 21dd1855128739289b53fdbc4d78966caf7480e8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 8 Apr 2009 00:01:49 +0000 Subject: [PATCH] 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 --- channels/chan_sip.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5b66b93..e4eda28 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; -- 1.7.9.5