From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 29 Mar 2017 19:38:29 +0000 (-0500)
Subject: FS-10196: [mod_conference] Layer collision when an avatar user has a role-id #resolve
X-Git-Tag: v1.8.0~655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a56eff110820dfaccb6375d292ba73c4c455e52;p=thirdparty%2Ffreeswitch.git

FS-10196: [mod_conference] Layer collision when an avatar user has a role-id #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 9df71b3e6e..9209532af2 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2494,7 +2494,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
 				
 
 				if ((!xlayer->member_id || (!member->avatar_png_img &&
-											xlayer->is_avatar &&
+											xlayer->is_avatar && !xlayer->geometry.role_id &&
 											(conference->canvas_count > 1 || xlayer->member_id != (int)conference->video_floor_holder))) &&
 					!xlayer->fnode && !xlayer->geometry.fileonly && !xlayer->geometry.res_id && !xlayer->geometry.flooronly) {
 					switch_status_t lstatus = conference_video_attach_video_layer(member, canvas, i);