Merged revisions 186837 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r186837 | mmichelson | 2009-04-07 19:01:49 -0500 (Tue, 07 Apr 2009) | 7 lines

  Fix bad merge from fix for issue 13867.

  (closes issue #14686)
  Reported by: davidw
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186839 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8275bafadd12c2035dcdc1570df2f73b58c7f003..b6be9bfb6c3e7b708d698268aaf910702278c7d8 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4618,11 +4618,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;