From: Michael Jerris <mike@jerris.com>
Date: Tue, 28 Jun 2016 17:10:47 +0000 (-0500)
Subject: FS-9305: [mod_conference] return the logo image path from video-logo-img api and... 
X-Git-Tag: v1.6.10~1^2~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78ebfff8e3f4eff748915a67176c65eed7159620;p=thirdparty%2Ffreeswitch.git

FS-9305: [mod_conference] return the logo image path from video-logo-img api and handle passing no image path
---

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);