Bug 1588084 - Add null-checking to isUrlbarFocused to avoid crashes o…

…n window shutdown. r=mikedeboer Differential Revision: https://phabricator.services.mozilla.com/D48966
mozilla-spidermonkey · Oct 11, 2019 · 4a2116b · 4a2116b
1 parent ecf4dd4
commit 4a2116b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/browser/components/touchbar/MacTouchBar.js b/browser/components/touchbar/MacTouchBar.js
@@ -293,6 +293,9 @@ class TouchBarHelper {
   }
 
   get isUrlbarFocused() {
+    if (!TouchBarHelper.window || !TouchBarHelper.window.gURLBar) {
+      return false;
+    }
     return TouchBarHelper.window.gURLBar.focused;
   }
 

diff --git a/widget/cocoa/nsTouchBar.mm b/widget/cocoa/nsTouchBar.mm
@@ -362,6 +362,11 @@ - (void)updatePopover:(NSPopoverTouchBarItem*)aPopoverItem input:(TouchBarInput*
 
   // Special handling to show/hide the search popover if the Urlbar is focused.
   if ([[aInput nativeIdentifier] isEqualToString:SearchPopoverIdentifier]) {
+    // We can reach this code during window shutdown. We only want to toggle
+    // showPopover if we are in a normal running state.
+    if (!mTouchBarHelper) {
+      return;
+    }
     bool urlbarIsFocused = false;
     mTouchBarHelper->GetIsUrlbarFocused(&urlbarIsFocused);
     if (urlbarIsFocused) {