From 9aab10e8202bef519b6989e2b296feee10073456 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 14 Dec 2006 02:35:39 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3646 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_conference/mod_conference.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index fe566a878a..389921c39e 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -863,7 +863,7 @@ static void conference_loop(conference_member_t *member) if (switch_channel_test_flag(channel, CF_OUTBOUND)) { /* test to see if outbound channel has answered */ if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n"); switch_set_flag(member->conference, CFLAG_ANSWERED); } } else { @@ -2577,7 +2577,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference, goto done; } /* add them to the conference */ - if (flags) { + if (flags && strcasecmp(flags, "none")) { snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags); switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); } else {