From: Brian West <brian@freeswitch.org>
Date: Mon, 19 Feb 2018 22:42:35 +0000 (-0600)
Subject: FS-10967: [mod_conference] chan var "conference_enter_sound" not working, only work... 
X-Git-Tag: v1.8.1~3^2~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ada117fb734c0c03539ea95e3aad25ebe48fecdb;p=thirdparty%2Ffreeswitch.git

FS-10967: [mod_conference] chan var "conference_enter_sound" not working, only work when profile param active and being overridden #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index 274f274c52..9d3c6d06c8 100644
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -866,7 +866,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
 				conference_file_stop(conference, FILE_STOP_ASYNC);
 			}
 
-			if (!switch_channel_test_app_flag_key("conference_silent", channel, CONF_SILENT_REQ) && !zstr(conference->enter_sound)) {
+			if (!switch_channel_test_app_flag_key("conference_silent", channel, CONF_SILENT_REQ)) {
 				const char * enter_sound = switch_channel_get_variable(channel, "conference_enter_sound");
 				if (conference_utils_test_flag(conference, CFLAG_ENTER_SOUND) && !conference_utils_member_test_flag(member, MFLAG_SILENT)) {
 					if (!zstr(enter_sound)) {