From 1fc08365659ce87e16a9e3fced7b77ab494ff36e Mon Sep 17 00:00:00 2001 From: Chad Phillips Date: Tue, 8 May 2018 14:25:51 -0700 Subject: [PATCH] FS-11149: Playing video files assigned a res_id not correctly updated on layout change Regular conference members that are assigned a reservation ID in a layout are automatically placed in that same reservation ID upon change of a layout. However, playing files that are assigned a reservation ID are not properly assigned to the same reservation ID upon layout change. This patch makes the behavior consistent between the two types. --- src/mod/applications/mod_conference/conference_video.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 859b135515..0688b15521 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -1662,6 +1662,13 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva conference_video_set_canvas_bgimg(canvas, conference->video_canvas_bgimg); } + switch_mutex_lock(conference->file_mutex); + if (conference->fnode && (conference->fnode->canvas_id == canvas->canvas_id || conference->fnode->canvas_id == -1)) { + conference_video_canvas_del_fnode_layer(conference, conference->fnode); + conference_video_fnode_check(conference->fnode, canvas->canvas_id); + } + switch_mutex_unlock(conference->file_mutex); + switch_mutex_unlock(canvas->write_mutex); switch_mutex_unlock(canvas->mutex);