move alwaysEnabled check to init (#3487)

So that if a module was somehow disabled (or `alwaysEnabled` was set retroactively) it still won't act disabled.
honestbleeps · Sep 27, 2016 · 90e6dd7 · 90e6dd7
1 parent 8ae5172
commit 90e6dd7
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/core/modules/modules.js b/lib/core/modules/modules.js
@@ -27,7 +27,9 @@ export async function _loadModulePrefs() {
 	const storedPrefs = await Storage.get('RES.modulePrefs') || {};
 
 	for (const id in modules) {
-		if (id in storedPrefs) {
+		if (modules[id].alwaysEnabled) {
+			enabled[id] = true;
+		} else if (id in storedPrefs) {
 			enabled[id] = storedPrefs[id];
 		} else {
 			enabled[id] = !modules[id].disabledByDefault;
@@ -37,9 +39,6 @@ export async function _loadModulePrefs() {
 
 export function setEnabled(opaqueId, enable) {
 	const module = get(opaqueId);
-	if (module.alwaysEnabled) {
-		return;
-	}
 	enable = !!enable;
 	// set enabled state of module
 	enabled[module.moduleID] = enable;