fix: check for pane focus before removing it.

Fixes #16883. This bug seems to have been introduced in the #15302's menu a11y refactor and is new in 5-0-x.
electron · Feb 27, 2019 · 388bec7 · 388bec7
1 parent e01c361
commit 388bec7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
@@ -119,7 +119,9 @@ bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
 }
 
 void MenuBar::OnBeforeExecuteCommand() {
-  RemovePaneFocus();
+  if (GetPaneFocusTraversable() != nullptr) {
+    RemovePaneFocus();
+  }
   window_->RestoreFocus();
 }