kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1522 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:bugfix/FS-11149-playing-video-files-assigned-a-res_id to master 

* commit '1fc08365659ce87e16a9e3fced7b77ab494ff36e':
  FS-11149: Playing video files assigned a res_id not correctly updated on layout change
This commit is contained in:
Christopher Rienzo 2018-08-24 18:45:32 +00:00
parent 59df2a31b0 1fc0836565
commit 63bf70dd24
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/conference_video.c
View File

@ -1676,6 +1676,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);