mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: Empty menu case (#15553)

Browse source
This commit is contained in:
Nitish Sakhawalkar 2018-11-02 12:32:57 -07:00 • committed by Shelley Vohr
parent 08ec270b90
commit 8566f8712c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_views.cc
View file

@ -894,6 +894,7 @@ void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
if (menu_model == nullptr) { if (menu_model == nullptr) {
global_menu_bar_.reset(); global_menu_bar_.reset();
root_view_->UnregisterAcceleratorsWithFocusManager(); root_view_->UnregisterAcceleratorsWithFocusManager();
return;
} }
if (!global_menu_bar_ && ShouldUseGlobalMenuBar()) if (!global_menu_bar_ && ShouldUseGlobalMenuBar())