From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 22 Apr 2015 14:30:53 +0000 (-0500)
Subject: FS-7513: skip patching logo when video muted
X-Git-Tag: v1.6.2~614^2~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8234dadcaf95973eb877b8dc4c1e569e924ea964;p=thirdparty%2Ffreeswitch.git

FS-7513: skip patching logo when video muted
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index bb79043495..329ffb77d3 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -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;