ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-26 05:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7513: cleanup

Browse Source
This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:47:02 -05:00
1 parent 7307005c56
commit 84074ab804
2 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_conference/mod_conference.c
+8 -8
View File
@@ -1078,6 +1078,10 @@ static void layer_set_logo(conference_member_t *member, mcu_layer_t *layer, cons
goto end;
}
if (path) {
switch_img_free(&layer->logo_img);
}
if (*path == '{') {
dup = strdup(path);
path = dup;
@@ -1117,12 +1121,6 @@ static void layer_set_logo(conference_member_t *member, mcu_layer_t *layer, cons
}
}
if (path) {
switch_img_free(&layer->logo_img);
}
if (path && strcasecmp(path, "clear")) {
layer->logo_img = switch_img_read_png(path);
}
@@ -8432,8 +8430,10 @@ static switch_status_t conf_api_sub_vid_logo_img(conference_member_t *member, sw
}
layer = &member->conference->canvas->layers[member->video_layer_id];
member->video_logo = switch_core_strdup(member->pool, text);
if (!strcasecmp(text, "clear")) {
member->video_logo = switch_core_strdup(member->pool, text);
}
layer_set_logo(member, layer, text);