Merge pull request #7962 from liusy182/disable-accelerator

disable accelerator when menu item is disabled
electron · Nov 15, 2016 · 301b8ec · 301b8ec
2 parents 89feefa + 9e91f31
commit 301b8ec
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc
@@ -90,11 +90,12 @@ bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
                                     const ui::Accelerator& accelerator) {
   if (ContainsKey(*table, accelerator)) {
     const accelerator_util::MenuItem& item = (*table)[accelerator];
-    item.model->ActivatedAt(item.position);
-    return true;
-  } else {
-    return false;
+    if (item.model->IsEnabledAt(item.position)) {
+      item.model->ActivatedAt(item.position);
+      return true;
+    }
   }
+  return false;
 }
 
 }  // namespace accelerator_util