1
0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-03 17:30:37 +00:00

Merge 5f058129394d16fe68d40b5a8d8f8dd7d9445876 into 5e82e4f305dbf3760b6f6e3ba8fb70c3de30a6b9

This commit is contained in:
James J. Ye 2025-01-31 16:48:23 +00:00 committed by GitHub
commit 7ce2b7056d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -3238,6 +3238,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
conference->tts_voice = switch_core_strdup(conference->pool, tts_voice);
}
conference->name = switch_core_strdup(conference->pool, name);
conference->video_layout_conf = switch_core_strdup(conference->pool, video_layout_conf);
conference->comfort_noise_level = comfort_noise_level;
conference->pin_retries = pin_retries;
@ -3601,9 +3602,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
/* its going to be 0 by default, set to a value otherwise so this should be safe */
conference->max_members = max_members;
conference->announce_count = announce_count;
conference->name = switch_core_strdup(conference->pool, name);
if ((name_domain = strchr(conference->name, '@'))) {
name_domain++;
conference->domain = switch_core_strdup(conference->pool, name_domain);