From 78ebfff8e3f4eff748915a67176c65eed7159620 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 28 Jun 2016 12:10:47 -0500 Subject: [PATCH] FS-9305: [mod_conference] return the logo image path from video-logo-img api and handle passing no image path --- .../mod_conference/conference_api.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c index 8bad7f14ff..29ec532075 100644 --- a/src/mod/applications/mod_conference/conference_api.c +++ b/src/mod/applications/mod_conference/conference_api.c @@ -1624,20 +1624,22 @@ switch_status_t conference_api_sub_vid_logo_img(conference_member_t *member, swi goto end; } - if (!strcasecmp(text, "allclear")) { - switch_channel_set_variable(member->channel, "video_logo_path", NULL); - member->video_logo = NULL; - } else if (!strcasecmp(text, "clear")) { - member->video_logo = NULL; - } else { - member->video_logo = switch_core_strdup(member->pool, text); - } + if (!zstr(text)) { + if (!strcasecmp(text, "allclear")) { + switch_channel_set_variable(member->channel, "video_logo_path", NULL); + member->video_logo = NULL; + } else if (!strcasecmp(text, "clear")) { + member->video_logo = NULL; + } else { + member->video_logo = switch_core_strdup(member->pool, text); + } - conference_video_layer_set_logo(member, layer, text); + conference_video_layer_set_logo(member, layer, text); + } end: - stream->write_function(stream, "+OK\n"); + stream->write_function(stream, "%s\n", member->video_logo ? member->video_logo : "_undef_"); conference_video_release_layer(&layer);