From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 7 Jan 2007 21:26:43 +0000 (+0000)
Subject: Merged revisions 49831 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3528
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4866a445358e9a683688aec670328dccd15f1aa9;p=thirdparty%2Fasterisk.git

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)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 16d9c4b349..f51ea9489b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8177,7 +8177,7 @@ static void sip_peer_hold(struct sip_pvt *p, int hold)
 	/* 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 */