Merge branch '0.0.9-alpha' of github.com:NuSkooler/enigma-bbs into user-interruptions

2018-11-23 22:19:18 -07:00
parent 080d1727c2 f80e07fcf9
commit 36e9356663
84 changed files with 1759 additions and 643 deletions
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -47,6 +47,11 @@ 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 beforeArtInterrupt(callback) {
@@ -56,7 +61,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
                    return self.beforeArt(callback);
                },
                function displayMenuArt(callback) {
-                    if(!_.isString(self.menuConfig.art)) {
+                    if(!hasArt()) {
                        return callback(null);
                    }