From d6a2deb0c532504bf36d30755460b2486e9473a1 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 28 Jan 2019 15:33:57 +0100
Subject: Add nullcheck for addons (pre-installed webextensions return null)

Tag #937.
---
 application/basilisk/components/nsBrowserGlue.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/basilisk')

diff --git a/application/basilisk/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js
index 3258159b6..c2e215376 100644
--- a/application/basilisk/components/nsBrowserGlue.js
+++ b/application/basilisk/components/nsBrowserGlue.js
@@ -1110,10 +1110,10 @@ BrowserGlue.prototype = {
       let disabledAddons = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_DISABLED);
       AddonManager.getAddonsByIDs(disabledAddons, (addons) => {
         for (let addon of addons) {
-          if (addon.type == "experiment")
+          if (addon && addon.type == "experiment")
             continue;
 
-          if (addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
+          if (addon && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
             this._notifyUnsignedAddonsDisabled();
             break;
           }
-- 
cgit v1.2.3