* fixed a bug which prevented the fspanel to show up in some circumstances. Patch...
authorFelix Paul Kühne <fkuehne@videolan.org>
Sat, 10 Feb 2007 17:47:50 +0000 (17:47 +0000)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sat, 10 Feb 2007 17:47:50 +0000 (17:47 +0000)
modules/gui/macosx/misc.m

index d92d5a0..1ecc4ef 100644 (file)
 
 - (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];
 }