From: Joshua Colp <jcolp@digium.com>
Date: Sat, 12 May 2007 16:33:34 +0000 (+0000)
Subject: Merged revisions 64044 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2697
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82a30356dab33982f8a7f7852bedc9f6985dde53;p=thirdparty%2Fasterisk.git

Merged revisions 64044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64044 | file | 2007-05-12 12:32:15 -0400 (Sat, 12 May 2007) | 2 lines

Ensure the onhold flag is set no matter what when being put on hold.

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7639337809..23bf71e838 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5724,6 +5724,8 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
 			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR);
 		else if (sendonly == 2)	/* Inactive stream */
 			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_INACTIVE);
+		else
+			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD);
 		if (global_notifyhold)
 			sip_peer_hold(p, TRUE);
 	}