From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 20 Nov 2015 19:19:20 +0000 (-0600)
Subject: FS-8543 make sure if the mute image is taken from the camera that it does not dissappear
X-Git-Tag: v1.6.6~1^2~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0bf340aa1eaa33c6e3e46ebea1f557eec6ae28;p=thirdparty%2Ffreeswitch.git

FS-8543 make sure if the mute image is taken from the camera that it does not dissappear
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 05d3ea3236..489564e6e5 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2285,13 +2285,19 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 					}
 
 					if (!layer->mute_patched) {
-
+						
+						if (!imember->video_mute_img) {
+							conference_video_vmute_snap(imember, SWITCH_FALSE);
+						}
+						
 						if (imember->video_mute_img || layer->mute_img) {
 							conference_video_clear_layer(layer);
-
-							if (!layer->mute_img && imember->video_mute_img) {
-								//layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
-								switch_img_copy(imember->video_mute_img, &layer->mute_img);
+							
+							if (!layer->mute_img) {								
+								if (imember->video_mute_img) {
+									//layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
+									switch_img_copy(imember->video_mute_img, &layer->mute_img);
+								}
 							}
 
 							if (layer->mute_img) {