]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9305: [mod_conference] return the logo image path from video-logo-img api and...
authorMichael Jerris <mike@jerris.com>
Tue, 28 Jun 2016 17:10:47 +0000 (12:10 -0500)
committerMichael Jerris <mike@jerris.com>
Tue, 28 Jun 2016 17:11:12 +0000 (12:11 -0500)
src/mod/applications/mod_conference/conference_api.c

index 8bad7f14ff3917f4982f69b4be2bd082879e053f..29ec532075b1ff9c9d6874c4527873a4c8793d60 100644 (file)
@@ -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);