[asterisk-commits] tilghman: trunk r49832 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Jan  7 15:26:43 2007
New Revision: 49832

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49832
Log:
Merged revisions 49831 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49831 | tilghman | 2007-01-07 15:24:04 -0600 (Sun, 07 Jan 2007) | 2 lines

Second condition was a subset of the first, so hold was never decremented, thus hint stayed stuck (Issue 8747)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=49832&r1=49831&r2=49832
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Jan  7 15:26:43 2007
@@ -8177,7 +8177,7 @@
 	/* If they put someone on hold, increment the value... otherwise decrement it */
 	if (hold)
 		peer->onHold++;
-	else if (hold > 0)
+	else
 		peer->onHold--;
 
 	/* Request device state update */