Author: anthm Date: Wed Dec 13 21:35:39 2006 New Revision: 3646 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Dec 13 21:35:39 2006 @@ -863,7 +863,7 @@ 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 @@ 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 {