From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 3 Nov 2014 17:32:40 +0000 (-0600)
Subject: FS-6957 #resolve
X-Git-Tag: v1.4.13~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3c157f121a86708e05881649ae652ce959ecbb;p=thirdparty%2Ffreeswitch.git

FS-6957 #resolve
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 8c4886066f..99511c8a9d 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -9278,8 +9278,10 @@ SWITCH_STANDARD_APP(conference_function)
 			if (flags_str) {
 				set_mflags(flags_str,&mflags);
 
-				if (!((mflags & MFLAG_CAN_SPEAK) && (mflags & MFLAG_INDICATE_MUTE))) {
-					switch_core_media_hard_mute(session, SWITCH_TRUE);
+				if (!(mflags & MFLAG_CAN_SPEAK)) {
+					if (!(mflags & MFLAG_INDICATE_MUTE)) {
+						switch_core_media_hard_mute(session, SWITCH_TRUE);
+					}
 				}
 
 				if (mflags & MFLAG_JOIN_ONLY) {
@@ -9579,8 +9581,10 @@ SWITCH_STANDARD_APP(conference_function)
 	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 (!(mflags & MFLAG_CAN_SPEAK)) {
+		if (!(mflags & MFLAG_INDICATE_MUTE)) {
+			switch_core_media_hard_mute(member.session, SWITCH_TRUE);
+		}
 	}
 
 	if (mpin_matched) {