From 265547eb941bcf48d2c8c9f9e8fbadcec1514a98 Mon Sep 17 00:00:00 2001 From: Akemi Date: Mon, 27 Mar 2017 01:29:45 +0200 Subject: osx: fix event propagation of menu bar item key shortcuts a small logic error in 063ca8f broke the filtering of the menu bar item key shortcuts. they where called several times per event because the propagation wasn't stopped properly. --- osdep/macosx_events.m | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'osdep') diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index 6cddd40026..fc7118de4c 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -510,10 +510,9 @@ void cocoa_set_mpv_handle(struct mpv_handle *ctx) - (bool)processKeyEvent:(NSEvent *)event { - if ((event.type == NSEventTypeKeyDown || event.type == NSEventTypeKeyUp) && - ![[NSApp mainMenu] performKeyEquivalent:event]) - { - [self handleKey:event]; + if (event.type == NSEventTypeKeyDown || event.type == NSEventTypeKeyUp){ + if (![[NSApp mainMenu] performKeyEquivalent:event]) + [self handleKey:event]; return true; } return false; -- cgit v1.2.3