From 89649d47d8fac7f0263421becb85acb4ee660e5d Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 10 Sep 2006 05:52:45 +0000 Subject: [PATCH] rever oops git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2606 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../mod_conference/mod_conference.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 6d2eba8e37..357ed7a74d 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2183,23 +2183,19 @@ static void conference_function(switch_core_session_t *session, char *data) *dpin++ = '\0'; } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } + if ((profiles = switch_xml_child(cfg, "profiles"))) { profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } - } else { - if ((profiles = switch_xml_child(cfg, "profiles"))) { - profile = switch_xml_find_child(profiles, "profile", "name", "default"); - } - } + } if (isbr) { char *uuid = switch_core_session_get_uuid(session);