Harden StudyUtils to go blind on a browser window being present and p…

…revent errors during a second shutdown during browser startup. Fixes #33.
mikedeboer · Aug 23, 2018 · 58d41a6 · 58d41a6
1 parent a024ed7
commit 58d41a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/addon/StudyUtils.patch b/addon/StudyUtils.patch
@@ -1,4 +1,8 @@
-713a714,716
+714c714,718
+<     if (!Services.wm.getMostRecentWindow("navigator:browser").gBrowser) {
+---
 >     if (!("triggeringPrincipal" in params)) {
 >       params.triggeringPrincipal = Services.scriptSecurityManager.createNullPrincipal({});
 >     }
+>     const window = Services.wm.getMostRecentWindow("navigator:browser");
+>     if (!window || !window.gBrowser) {
diff --git a/addon/bootstrap.js b/addon/bootstrap.js
@@ -159,7 +159,9 @@ this.Bootstrap = {
         .AddonManager.getAddonByID(addonData.id);
       // This is needed even for onUninstalling, because it nukes the addon
       // from UI. If we don't do this, the user has a chance to "undo".
-      addon.uninstall();
+      if (addon) {
+        addon.uninstall();
+      }
     }
 
     // Unload addon-specific modules