]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9167 #resolve [Playing file when all video feeds are vmuted does not show file]
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 17 May 2016 18:41:19 +0000 (13:41 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 17 May 2016 18:41:19 +0000 (13:41 -0500)
src/mod/applications/mod_conference/conference_file.c
src/mod/applications/mod_conference/conference_video.c

index 6cf27559a3dd057193483add8803b08256dced6e..eceff51148b1763ce8e84032dcb70192d7a1ea76 100644 (file)
@@ -240,7 +240,7 @@ switch_status_t conference_file_play(conference_obj_t *conference, char *file, u
 
        flags = SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT;
 
-       if (conference->members_with_video && conference_utils_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
+       if (conference_utils_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
                flags |= SWITCH_FILE_FLAG_VIDEO;
        }
 
index dd16741fb56656760e118b47844239db84b5d256..90f3144071c064371b95e9416298d5f5283d3166 100644 (file)
@@ -1459,7 +1459,7 @@ void conference_video_canvas_set_fnode_layer(mcu_canvas_t *canvas, conference_fi
        fnode->layer_id = idx;
        fnode->canvas_id = canvas->canvas_id;
 
-       if (layer->member_id > -1) {
+       if (layer->member_id > 0) {
                conference_member_t *member;
 
                if ((member = conference_member_get(canvas->conference, layer->member_id))) {