From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 8 Aug 2018 14:02:41 +0000 (+0000)
Subject: FS-11321: [mod_conference] Don't set avatar when its not allowed anyway #resolve
X-Git-Tag: v1.8.2~1^2~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d521e708d35d44f60ea37c283f7f97ee4e8f2c03;p=thirdparty%2Ffreeswitch.git

FS-11321: [mod_conference] Don't set avatar when its not allowed anyway #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 223da15685..2ff228f480 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2483,6 +2483,11 @@ void conference_video_check_avatar(conference_member_t *member, switch_bool_t fo
 		avatar = var;
 	}
 
+	if (conference_utils_test_flag(member->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || conference_utils_test_flag(member->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS)) {
+		avatar = NULL;
+		force = 0;
+	}
+	
 	switch_mutex_lock(member->flag_mutex);
 	switch_img_free(&member->avatar_png_img);