From f69573002cbe4fe1200312c688f6692808a089ef Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 17 Jul 2012 13:54:39 -0500 Subject: [PATCH] set hard domain first --- src/mod/applications/mod_conference/mod_conference.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index c8c9ad3de0..e527b22b31 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -8290,14 +8290,14 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c conference->name = switch_core_strdup(conference->pool, name); - if (presence_id && (name_domain = strchr(presence_id, '@'))) { - name_domain++; - conference->domain = switch_core_strdup(conference->pool, name_domain); - } else if ((name_domain = strchr(conference->name, '@'))) { + if ((name_domain = strchr(conference->name, '@'))) { name_domain++; conference->domain = switch_core_strdup(conference->pool, name_domain); } else if (domain) { conference->domain = switch_core_strdup(conference->pool, domain); + } else if (presence_id && (name_domain = strchr(presence_id, '@'))) { + name_domain++; + conference->domain = switch_core_strdup(conference->pool, name_domain); } else { conference->domain = "cluecon.com"; }