Keep reference to MenuDelegate as a member (so it won't go out of sco…

…pe and auto-close/destroy). Fixes brave/browser-laptop#9470 Auditor: @darkdh
brave · Jun 17, 2017 · fdf9f8e · fdf9f8e
1 parent a8ae8f0
commit fdf9f8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
@@ -53,9 +53,11 @@ MenuBar::MenuBar()
   UpdateMenuBarColor();
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, 0));
+  menu_delegate_ = new MenuDelegate(this);
 }
 
 MenuBar::~MenuBar() {
+  if (menu_delegate_) delete menu_delegate_;
 }
 
 void MenuBar::SetMenu(AtomMenuModel* model) {
@@ -151,8 +153,7 @@ void MenuBar::OnMenuButtonClicked(views::MenuButton* source,
     return;
   }
 
-  MenuDelegate menu_delegate(this);
-  menu_delegate.RunMenu(menu_model_->GetSubmenuModelAt(id), source);
+  menu_delegate_->RunMenu(menu_model_->GetSubmenuModelAt(id), source);
 }
 
 void MenuBar::OnNativeThemeChanged(const ui::NativeTheme* theme) {

diff --git a/atom/browser/ui/views/menu_bar.h b/atom/browser/ui/views/menu_bar.h
@@ -63,6 +63,7 @@ class MenuBar : public views::View,
   void UpdateMenuBarColor();
 
   SkColor background_color_;
+  MenuDelegate* menu_delegate_;
 
 #if defined(USE_X11)
   SkColor enabled_color_;