Commit 7da44adb authored by Felix Paul Kühne's avatar Felix Paul Kühne

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

* 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.
parent 9a814428
......@@ -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];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment