]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-6957 #resolve
authorAnthony Minessale <anthm@freeswitch.org>
Mon, 3 Nov 2014 17:32:40 +0000 (11:32 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Mon, 3 Nov 2014 17:32:40 +0000 (11:32 -0600)
src/mod/applications/mod_conference/mod_conference.c

index 8c4886066f3e7d023c4c3acea61409b0a952826c..99511c8a9daeb6360c49fc1a774e303e6f7d6aef 100644 (file)
@@ -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) {