diff --git a/core/fse.js b/core/fse.js index fcf27ad4..98065b58 100644 --- a/core/fse.js +++ b/core/fse.js @@ -542,7 +542,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul theme.displayThemedAsset( art[n], self.client, - { font : self.menuConfig.font, acsCondMember : 'art' }, + { font : self.menuConfig.font }, function displayed(err) { next(err); } @@ -622,7 +622,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul theme.displayThemedAsset( art[n], self.client, - { font : self.menuConfig.font, acsCondMember : 'art' }, + { font : self.menuConfig.font }, function displayed(err, artData) { if(artData) { mciData[n] = artData; diff --git a/core/menu_module.js b/core/menu_module.js index ee1502cb..0ce2a2a6 100644 --- a/core/menu_module.js +++ b/core/menu_module.js @@ -49,13 +49,18 @@ exports.MenuModule = class MenuModule extends PluginModule { const mciData = {}; let pausePosition; + const hasArt = () => { + return _.isString(self.menuConfig.art) || + (Array.isArray(self.menuConfig.art) && _.has(self.menuConfig.art[0], 'acs')); + }; + async.series( [ function beforeDisplayArt(callback) { self.beforeArt(callback); }, function displayMenuArt(callback) { - if(!_.isString(self.menuConfig.art)) { + if(!hasArt()) { return callback(null); } diff --git a/core/theme.js b/core/theme.js index 6414da62..052eeac7 100644 --- a/core/theme.js +++ b/core/theme.js @@ -682,8 +682,9 @@ function displayThemedAsset(assetSpec, client, options, cb) { options = {}; } - if(Array.isArray(assetSpec) && _.isString(options.acsCondMember)) { - assetSpec = client.acs.getConditionalValue(assetSpec, options.acsCondMember); + if(Array.isArray(assetSpec)) { + const acsCondMember = options.acsCondMember || 'art'; + assetSpec = client.acs.getConditionalValue(assetSpec, acsCondMember); } const artAsset = asset.getArtAsset(assetSpec);