FS-6957 #resolve

This commit is contained in:
Anthony Minessale 2014-11-03 11:32:40 -06:00
parent 7ca4ac566c
commit 8f3c157f12
1 changed files with 8 additions and 4 deletions

View File

@ -9278,8 +9278,10 @@ SWITCH_STANDARD_APP(conference_function)
if (flags_str) { if (flags_str) {
set_mflags(flags_str,&mflags); set_mflags(flags_str,&mflags);
if (!((mflags & MFLAG_CAN_SPEAK) && (mflags & MFLAG_INDICATE_MUTE))) { if (!(mflags & MFLAG_CAN_SPEAK)) {
switch_core_media_hard_mute(session, SWITCH_TRUE); if (!(mflags & MFLAG_INDICATE_MUTE)) {
switch_core_media_hard_mute(session, SWITCH_TRUE);
}
} }
if (mflags & MFLAG_JOIN_ONLY) { if (mflags & MFLAG_JOIN_ONLY) {
@ -9579,8 +9581,10 @@ SWITCH_STANDARD_APP(conference_function)
set_mflags(flags_str, &mflags); set_mflags(flags_str, &mflags);
mflags |= MFLAG_RUNNING; mflags |= MFLAG_RUNNING;
if (!((mflags & MFLAG_CAN_SPEAK) && (mflags & MFLAG_INDICATE_MUTE))) { if (!(mflags & MFLAG_CAN_SPEAK)) {
switch_core_media_hard_mute(member.session, SWITCH_TRUE); if (!(mflags & MFLAG_INDICATE_MUTE)) {
switch_core_media_hard_mute(member.session, SWITCH_TRUE);
}
} }
if (mpin_matched) { if (mpin_matched) {