]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-3091 --resolve
authorMarc Olivier Chouinard <mochouinard@moctel.com>
Fri, 16 Dec 2011 03:38:32 +0000 (22:38 -0500)
committerMarc Olivier Chouinard <mochouinard@moctel.com>
Fri, 16 Dec 2011 03:38:32 +0000 (22:38 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 403b530cdec539deb472679c666f4d0b4d14234a..a90259dbed70131a0aba920bb7afef22339a4d39 100644 (file)
@@ -1857,6 +1857,9 @@ static void conference_loop_fn_lock_toggle(conference_member_t *member, caller_c
        if (member == NULL)
                return;
 
+       if (switch_test_flag(member->conference, CFLAG_WAIT_MOD) && !switch_test_flag(member, MFLAG_MOD) )
+               return; 
+
        if (!switch_test_flag(member->conference, CFLAG_LOCKED)) {
                if (member->conference->is_locked_sound) {
                        conference_play_file(member->conference, member->conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0);