From ce3b48158dc435e02b55b33c5cc766a628c8eca8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 12 Aug 2008 15:34:25 +0000 Subject: [PATCH] perpetual sound does not auto-mute, you can do that yourself if you want it git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9258 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_conference/mod_conference.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 82bf9a5da9..4029d98920 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -5026,11 +5026,10 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m if (!switch_strlen_zero(perpetual_sound)) { conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound); - conference->mflags = MFLAG_CAN_HEAR; - } else { - conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; } + conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + if (!switch_strlen_zero(moh_sound) && switch_is_moh(moh_sound)) { conference->moh_sound = switch_core_strdup(conference->pool, moh_sound); }