[asterisk-commits] file: branch 1.6.1 r174714 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Feb 10 14:17:43 2009
New Revision: 174714

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174714
Log:
Merged revisions 174710 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174710 | file | 2009-02-10 16:15:43 -0400 (Tue, 10 Feb 2009) | 4 lines
  
  Only decrease inringing count if above zero.
  (issue #13238)
  Reported by: kowalma
........

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=174714&r1=174713&r2=174714
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Feb 10 14:17:43 2009
@@ -4887,7 +4887,9 @@
 			sip_pvt_lock(fup);
 			ao2_lock(p);
 			if (ast_test_flag(&fup->flags[0], SIP_INC_RINGING)) {
-				(*inringing)--;
+				if (*inringing > 0) {
+					(*inringing)--;
+				}
 				ast_clear_flag(&fup->flags[0], SIP_INC_RINGING);
 			}
 			ao2_unlock(p);