]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-11321: [mod_conference] Don't set avatar when its not allowed anyway #resolve
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 8 Aug 2018 14:02:41 +0000 (14:02 +0000)
committerMike Jerris <mike@jerris.com>
Mon, 13 Aug 2018 19:01:14 +0000 (19:01 +0000)
src/mod/applications/mod_conference/conference_video.c

index 223da156852e16328c4e33ca38293f7a7eed143f..2ff228f4808eb2e91059d850e80778430b0b1908 100644 (file)
@@ -2483,6 +2483,11 @@ void conference_video_check_avatar(conference_member_t *member, switch_bool_t fo
                avatar = var;
        }
 
+       if (conference_utils_test_flag(member->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || conference_utils_test_flag(member->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS)) {
+               avatar = NULL;
+               force = 0;
+       }
+       
        switch_mutex_lock(member->flag_mutex);
        switch_img_free(&member->avatar_png_img);