Merge pull request #15335 from prlanzarin/u25/fix/vbg-settings-yml

fix: don`t ignore settings.yml virtualBackgrounds.enabled config
This commit is contained in:
Ramón Souza 2022-07-07 15:08:48 +01:00 committed by GitHub
commit 1b9afd0173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions

View File

@ -49,5 +49,5 @@ export function isLayoutsEnabled() {
}
export function isVirtualBackgroundsEnabled() {
return getDisabledFeatures().indexOf('virtualBackgrounds') === -1;
return getDisabledFeatures().indexOf('virtualBackgrounds') === -1 && Meteor.settings.public.virtualBackgrounds.enabled;
}

View File

@ -34,7 +34,6 @@ const MODELS = {
};
const {
enabled: VIRTUAL_BACKGROUND_ENABLED = true,
thumbnailsPath: THUMBNAILS_PATH = '/resources/images/virtual-backgrounds/thumbnails/',
fileNames: IMAGE_NAMES = ['home.jpg', 'coffeeshop.jpg', 'board.jpg'],
storedOnBBB: IS_STORED_ON_BBB = true,