🐛 Fix errors when unloading the browser

dothq · Mar 17, 2024 · ac268f6 · ac268f6
1 parent 7e1105a
commit ac268f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/actors/DotTooltipListenerChild.sys.mjs b/actors/DotTooltipListenerChild.sys.mjs
@@ -351,7 +351,7 @@ export class DotTooltipListenerChild extends JSWindowActorChild {
 		// Check if we're in an active chrome window
 		if (
 			!doc ||
-			doc.ownerGlobal.browsingContext.isContent ||
+			doc?.ownerGlobal.browsingContext.isContent ||
 			Services.focus.focusedWindow != win.top
 		) {
 			return;

diff --git a/components/status/content/browser-status.js b/components/status/content/browser-status.js
@@ -53,13 +53,17 @@ class BrowserStatusPanel extends BrowserContextualMixin(MozHTMLElement) {
 	 * Obtains the current status value
 	 */
 	getStatus() {
+		// Check if we have a contextual tab or browser
+		// before computing the status text.
+		if (!this.hostContext.tab || !this.hostContext.browser) return;
+
 		for (const statusType of this.STATUS_HIERARCHY) {
 			// Special case for busy statuses:
 			// Ensure the document is actually loading,
 			// otherwise we just skip it.
 			if (
 				statusType == "busy" &&
-				!this.hostContext.browser.webProgress.isLoadingDocument
+				!this.hostContext.browser.webProgress?.isLoadingDocument
 			) {
 				continue;
 			}