From 48ebebcafe47fb4a1e659bc2202d61e3ee7692bb Mon Sep 17 00:00:00 2001
From: Nitish Sakhawalkar <nitsakh@icloud.com>
Date: Thu, 8 Nov 2018 08:11:15 -0800
Subject: [PATCH] fix: Linux empty menu model handling (#15605)

* fix: Linux empty menu model handling

* Update root_view.cc
---
 atom/browser/native_window_views.cc | 1 -
 atom/browser/ui/views/root_view.cc  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 42537e0ef39c..5f6b1f0ab09c 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -894,7 +894,6 @@ void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
   if (menu_model == nullptr) {
     global_menu_bar_.reset();
     root_view_->UnregisterAcceleratorsWithFocusManager();
-    return;
   }
 
   if (!global_menu_bar_ && ShouldUseGlobalMenuBar())
diff --git a/atom/browser/ui/views/root_view.cc b/atom/browser/ui/views/root_view.cc
index b7aedfbb9034..d9bafcf7b2d4 100644
--- a/atom/browser/ui/views/root_view.cc
+++ b/atom/browser/ui/views/root_view.cc
@@ -178,9 +178,10 @@ bool RootView::AcceleratorPressed(const ui::Accelerator& accelerator) {
 }
 
 void RootView::RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model) {
+  if (!menu_model)
+    return;
   // Clear previous accelerators.
   UnregisterAcceleratorsWithFocusManager();
-
   views::FocusManager* focus_manager = GetFocusManager();
   // Register accelerators with focus manager.
   accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);