]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9911: [mod_conference] Canvas not clearing when video playback of file is done...
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 3 Jan 2017 21:27:08 +0000 (15:27 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 3 Jan 2017 21:30:04 +0000 (15:30 -0600)
src/mod/applications/mod_conference/mod_conference.c

index eeaab028ed908d50b5a99740e9442a7863eae107..b21bd40cd7f2c6add361f5829616fb94f1ba742a 100644 (file)
@@ -709,14 +709,14 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
                        conference_file_node_t *fnode;
                        switch_memory_pool_t *pool;
 
-                       if (conference->canvases[0] && conference->fnode->layer_id > -1 ) {
-                               conference_video_canvas_del_fnode_layer(conference, conference->fnode);
-                       }
-
                        if (conference->fnode->type != NODE_TYPE_SPEECH) {
                                conference_file_close(conference, conference->fnode);
                        }
 
+                       if (conference->canvases[0] && conference->fnode->layer_id > -1 ) {
+                               conference_video_canvas_del_fnode_layer(conference, conference->fnode);
+                       }
+
                        fnode = conference->fnode;
                        conference->fnode = conference->fnode->next;