rever oops

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2606 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 6d2eba8e372767b021c2ed85a4f185229d5e57d5..357ed7a74d80dac3bcd41f97dc686c7ea4a27934 100644 (file)
--- 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';
 
-               if ((profiles = switch_xml_child(cfg, "profiles"))) {
-                       profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
+               /* 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;
                }
-       } else {
+               
                if ((profiles = switch_xml_child(cfg, "profiles"))) {
-                       profile = switch_xml_find_child(profiles, "profile", "name", "default");
+                       profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
                }
-       }
+       } 
 
        if (isbr) {
                char *uuid = switch_core_session_get_uuid(session);