From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 28 Oct 2014 20:01:02 +0000 (-0500)
Subject: FS-6950 #resolve
X-Git-Tag: v1.4.13~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548875791762a1abe931af285e288c1a10daa25d;p=thirdparty%2Ffreeswitch.git

FS-6950 #resolve
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index dbcab987c8..4fbce0152a 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2822,6 +2822,10 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
 		gen_arc(conference, NULL);
 	}
 
+	if (member->session) {
+		switch_core_media_hard_mute(member->session, SWITCH_FALSE);
+	}
+
 	switch_mutex_unlock(conference->mutex);
 	status = SWITCH_STATUS_SUCCESS;
 
@@ -9574,6 +9578,11 @@ SWITCH_STANDARD_APP(conference_function)
 	mflags = conference->mflags;
 	set_mflags(flags_str, &mflags);
 	mflags |= MFLAG_RUNNING;
+
+	if (!(mflags & MFLAG_CAN_SPEAK) && (mflags & MFLAG_INDICATE_MUTE)) {
+		switch_core_media_hard_mute(member.session, SWITCH_TRUE);
+	}
+
 	if (mpin_matched) {
 		mflags |= MFLAG_MOD;
 	}