]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: skip patching logo when video muted
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 22 Apr 2015 14:30:53 +0000 (09:30 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:24 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index bb79043495e3cc129393085feb265fd284aea7f6..329ffb77d343c07887531ffbb9924456943681b3 100644 (file)
@@ -1103,7 +1103,7 @@ static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer, sw
                        switch_img_patch(IMG, layer->img, x_pos, y_pos);
                }
 
-               if (layer->logo_img) {
+               if (layer->logo_img && !ximg) {
                        int ew = layer->screen_w, eh = layer->screen_h - (layer->banner_img ? layer->banner_img->d_h : 0);
                        int ex = 0, ey = 0;