Restoring module initialization mechanism (for modules that have not …

…only the index)
sashuk · Sep 26, 2018 · 1906d63 · 1906d63
1 parent 09d81de
commit 1906d63
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/browser/modules/init.js b/browser/modules/init.js
@@ -266,10 +266,12 @@ module.exports = {
                         let enabledExtensionsCopy = JSON.parse(JSON.stringify(window.vidiConfig.enabledExtensions));
                         $.each(vidiConfig.extensions.browser, function (i, v) {
                             $.each(v[Object.keys(v)[0]], function (n, m) {
-                                let enabledExtensionIndex = enabledExtensionsCopy.indexOf(Object.keys(v)[0]);
-                                if (enabledExtensionIndex > -1) {
+                                if (window.vidiConfig.enabledExtensions.indexOf(Object.keys(v)[0]) > -1) {
                                     modules.extensions[Object.keys(v)[0]][m].init();
-                                    enabledExtensionsCopy.splice(enabledExtensionIndex, 1);
+                                    let enabledExtensionIndex = enabledExtensionsCopy.indexOf(Object.keys(v)[0]);
+                                    if (enabledExtensionIndex > -1) {
+                                        enabledExtensionsCopy.splice(enabledExtensionIndex, 1);
+                                    }
                                 }
                             })
                         });