Bug 1089695 - Fixing wrong dependency in Places shutdown. r=mak

2015-08-10 11:07:54 +02:00
parent 7b1614acf4
commit cb15aec7a6
3 changed files with 56 additions and 23 deletions
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -65,7 +65,13 @@ Sanitizer.prototype = {
      var itemsToClear = [...aItemsToClear];
    } else {
      let branch = Services.prefs.getBranch(this.prefDomain);
-      itemsToClear = Object.keys(this.items).filter(itemName => branch.getBoolPref(itemName));
+      itemsToClear = Object.keys(this.items).filter(itemName => {
+        try {
+          return branch.getBoolPref(itemName);
+        } catch (ex) {
+          return false;
+        }
+      });
    }

    // Ensure open windows get cleared first, if they're in our list, so that they don't stick