fix: check for pane focus before removing it. (electron#17164)

Fixes electron#16883. This bug seems to have been introduced in the electron#15302's menu a11y refactor and is new in 5-0-x.
kiku-jw · May 16, 2019 · f17a798 · f17a798
1 parent 7d082f5
commit f17a798
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();
 }