From 08fa9f62aea3f69ab70d50248445e73436ff84d6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 3 Mar 2017 17:35:03 -0600 Subject: [PATCH] FS-10091: [mod_conference] Conference play file with full-screen=true has side effect on member video #resolve --- src/mod/applications/mod_conference/conference_video.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index faf662e091..e6e03ffa5e 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2696,16 +2696,15 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id); } - conference_video_pop_next_image(imember, &img); - layer = NULL; - - if (conference->playing_video_file) { switch_img_free(&img); switch_core_session_rwunlock(imember->session); continue; } + conference_video_pop_next_image(imember, &img); + layer = NULL; + switch_mutex_lock(canvas->mutex); //printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id,