From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sat, 10 Feb 2007 17:47:50 +0000 (+0000)
Subject: * fixed a bug which prevented the fspanel to show up in some circumstances. Patch... 
X-Git-Tag: 0.9.0-test0~8655
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7da44adb9513478ddb19503e8e5c9064b688bba9;p=vlc

* fixed a bug which prevented the fspanel to show up in some circumstances. Patch by Pierre d'Herbemont pdherbemont --at,- free.fr. This commit priortises Cocoa hotkeys instead of VLC's natives which is a good idea IMO.
---

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index d92d5a02f4..1ecc4efdf0 100644
--- 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];
 }