summaryrefslogtreecommitdiff
path: root/src/Fl_Sys_Menu_Bar.mm
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2014-02-11 09:02:10 +0000
committerManolo Gouy <Manolo>2014-02-11 09:02:10 +0000
commit0b6475d8d6c75a3fe9e0d67077e2f93a736ea1f6 (patch)
tree4959e26a423193230bdbdc7b3ff2f24d98cf28ed /src/Fl_Sys_Menu_Bar.mm
parentb01cbd577b953326667e82214b93dedb87f531d2 (diff)
Exclude processing of system menu shortcuts when a modal window is running.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10100 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Sys_Menu_Bar.mm')
-rw-r--r--src/Fl_Sys_Menu_Bar.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Fl_Sys_Menu_Bar.mm b/src/Fl_Sys_Menu_Bar.mm
index 83329cb1c..8a42ba02f 100644
--- a/src/Fl_Sys_Menu_Bar.mm
+++ b/src/Fl_Sys_Menu_Bar.mm
@@ -457,7 +457,7 @@ void Fl_Sys_Menu_Bar::draw() {
static int process_sys_menu_shortcuts(int event)
{
- if (event != FL_SHORTCUT || !fl_sys_menu_bar) return 0;
+ if (event != FL_SHORTCUT || !fl_sys_menu_bar || Fl::modal()) return 0;
// have the system menu process the shortcut, highlighting the corresponding menu if found
return [[NSApp mainMenu] performKeyEquivalent:[NSApp currentEvent]];
}