From: Marc Olivier Chouinard <mochouinard@moctel.com>
Date: Fri, 16 Dec 2011 03:38:32 +0000 (-0500)
Subject: FS-3091 --resolve
X-Git-Tag: v1.2-rc1~27^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14554cf32845708d5c4beccd3d314c2e82b1f108;p=thirdparty%2Ffreeswitch.git

FS-3091 --resolve
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 403b530cde..a90259dbed 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -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);