From b69f8d4a345363d6e18e1f7beb770c23d171c1d1 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Wed, 24 Feb 2016 15:15:42 -0800
Subject: [PATCH] Bug 1245277 loop addon needs to respect prior set default
 prefs, not restartless, r=Standard8

---
 browser/extensions/loop/bootstrap.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/extensions/loop/bootstrap.js b/browser/extensions/loop/bootstrap.js
index b5d9e5451940..fe019493d9f3 100644
--- a/browser/extensions/loop/bootstrap.js
+++ b/browser/extensions/loop/bootstrap.js
@@ -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();