From b8bfe8a9ad0ae1c327d2188dc0b02a6104850a42 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 18 Aug 2014 14:58:52 +0800
Subject: [PATCH] views: Always hide accelerator when submenu is activated.

---
 atom/browser/ui/views/menu_bar.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
index 1397b9013d..cafc7ef829 100644
--- a/atom/browser/ui/views/menu_bar.cc
+++ b/atom/browser/ui/views/menu_bar.cc
@@ -101,10 +101,8 @@ int MenuBar::GetAcceleratorIndex(base::char16 key) {
 
 void MenuBar::ActivateAccelerator(base::char16 key) {
   int i = GetAcceleratorIndex(key);
-  if (i != -1) {
-    SetAcceleratorVisibility(false);
+  if (i != -1)
     static_cast<SubmenuButton*>(child_at(i))->Activate();
-  }
 }
 
 int MenuBar::GetItemCount() const {
@@ -143,6 +141,9 @@ void MenuBar::ButtonPressed(views::Button* sender, const ui::Event& event) {
 
 void MenuBar::OnMenuButtonClicked(views::View* source,
                                   const gfx::Point& point) {
+  // Hide the accelerator when a submenu is activated.
+  SetAcceleratorVisibility(false);
+
   if (!menu_model_)
     return;