* fixed a bug which prevented the fspanel to show up in some circumstances. Patch...

[vlc] / modules / gui / macosx / misc.m

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index d92d5a02f430b132f18be241e76a69501a4e4e69..1ecc4efdf033b99cc081aaceb0e958a82b7d793c 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -47,6 +47,11 @@
 
 - (BOOL)performKeyEquivalent:(NSEvent *)o_event
 {
+    /* We indeed want to prioritize Cocoa key equivalent against libvlc,
+       so we perform the menu equivalent now. */
+    if([[NSApp mainMenu] performKeyEquivalent:o_event])
+        return TRUE;
+
     return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] ||
            [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event];
 }