Fix some log lines and a flag logic.

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 9c3ba0f6151cc1dc0aad8bfe30ba7d62f2d94792..fa1f12c13f55b38c4782504825fa46a72f0c01b1 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -30,6 +30,7 @@
  * Chris Danielson <chris at maxpowersoft dot com>
  * Rupa Schomaker <rupa@rupa.com>
  * David Weekly <david@weekly.org>
+ * Joao Mesquita <jmesquita@gmail.com>
  *
  * mod_conference.c -- Software Conference Bridge
  *
@@ -689,13 +690,13 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
                        }
 
                        if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ) && !zstr(conference->enter_sound)) {
-                               if (!zstr(switch_channel_get_variable(channel, "conference_enter_sound"))) {
-                                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing file...%s\n", conference->name);
-                                    conference_play_file(conference, (char *)switch_channel_get_variable(channel, "conference_enter_sound"), CONF_DEFAULT_LEADIN,
-                                                    switch_core_session_get_channel(member->session), switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1);
+                                const char * enter_sound = switch_channel_get_variable(channel, "conference_enter_sound");
+                               if (!zstr(enter_sound)) {
+                                    conference_play_file(conference, (char *)enter_sound, CONF_DEFAULT_LEADIN,
+                                                    switch_core_session_get_channel(member->session), !switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1);
                                } else {
                                     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);
+                                                                        !switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1);
                                }
                        }
                }