]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: don't attach when you don't have video
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 12 Feb 2015 16:53:21 +0000 (10:53 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:00 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index d0d359a192c0c147f2a58ae57d462b88de37fb66..6b486038140a40d9a03df5614c030ce5d7e02f37 100644 (file)
@@ -1097,9 +1097,15 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx)
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        const char *banner = NULL;
        switch_rgb_color_t color;
-
+       
        if (!member->session) abort();
 
+       channel = switch_core_session_get_channel(member->session);
+
+       if (!switch_channel_test_flag(channel, CF_VIDEO)) {
+               return SWITCH_STATUS_FALSE;
+       }
+
        switch_mutex_lock(member->conference->canvas->mutex);
 
        layer = &member->conference->canvas->layers[idx];
@@ -1116,7 +1122,7 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx)
 
        reset_layer(member->conference->canvas, layer);
 
-       channel = switch_core_session_get_channel(member->session);
+
        res_id = switch_channel_get_variable_dup(channel, "video_reservation_id", SWITCH_FALSE, -1);
        
        if (layer->geometry.res_id || res_id) {