From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 15 Oct 2010 01:07:26 +0000 (-0500)
Subject: FS-2781
X-Git-Tag: v1.2-rc1~265^2~11^2~184^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d5389bd94438b4cdd3bd2389804a79dd9bfcc79;p=thirdparty%2Ffreeswitch.git

FS-2781
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index fef059cf07..b9127c9f2f 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -682,7 +682,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 				conference_stop_file(conference, FILE_STOP_ASYNC);
 			}
 
-			if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ)) {
+			if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ) && !zstr(conference->enter_sound)) {
 				conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session),
 									 switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1);
 			}
@@ -2868,6 +2868,10 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
 
 	switch_assert(conference != NULL);
 
+	if (zstr(file)) {
+		return SWITCH_STATUS_NOTFOUND;
+	}
+
 	switch_mutex_lock(conference->mutex);
 	switch_mutex_lock(conference->member_mutex);
 	count = conference->count;