[svn-commits] mmichelson: trunk r186837 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Apr  7 19:01:49 2009
New Revision: 186837

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186837
Log:
Fix bad merge from fix for issue 13867.

(closes issue #14686)
Reported by: davidw



Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=186837&r1=186836&r2=186837
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Apr  7 19:01:49 2009
@@ -5111,11 +5111,9 @@
 	res = update_call_counter(p, INC_CALL_RINGING);
 
 	if (res == -1) {
+		ast->hangupcause = AST_CAUSE_USER_BUSY;
 		return res;
-	} else {
-		ast->hangupcause = AST_CAUSE_USER_BUSY;
-	}
-
+	}
 	p->callingpres = ast->cid.cid_pres;
 	p->jointcapability = ast_translate_available_formats(p->capability, p->prefcodec);
 	p->jointnoncodeccapability = p->noncodeccapability;