Bug 1245277 loop addon needs to respect prior set default prefs, not restartless, r=Standard8

This commit is contained in:
Shane Caraveo 2016-02-24 15:15:42 -08:00
parent 930333e06e
commit b69f8d4a34

View File

@ -956,6 +956,11 @@ function loadDefaultPrefs() {
var branch = Services.prefs.getDefaultBranch("");
Services.scriptloader.loadSubScript("chrome://loop/content/preferences/prefs.js", {
pref: (key, val) => {
// If a previously set default pref exists don't overwrite it. This can
// happen for ESR or distribution.ini.
if (branch.getPrefType(key) != branch.PREF_INVALID) {
return;
}
switch (typeof val) {
case "boolean":
branch.setBoolPref(key, val);
@ -979,6 +984,9 @@ function startup(data) {
WindowListener.addonVersion = data.version;
loadDefaultPrefs();
if (!Services.prefs.getBoolPref("loop.enabled")) {
return;
}
createLoopButton();