[svn-commits] mmichelson: branch 1.6.1 r186839 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Apr  7 19:02:39 2009
New Revision: 186839

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186839
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=186839&r1=186838&r2=186839
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Apr  7 19:02:39 2009
@@ -4618,11 +4618,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;