From 81228eac0e3834511d88c320afd036c0859a85ba Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 30 Jun 2016 11:00:34 -0400 Subject: [PATCH] Improve the fix for the Ctrl+F6 cycle --- src/commands/CommandManager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index b0be93080..7663fc443 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -149,17 +149,19 @@ public: wxKeyEvent wxevent([event type] == NSKeyDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); impl->SetupKeyEvent(wxevent, event); + NSEvent *result; if ([event type] == NSKeyDown) { wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent); - return FilterEvent(eventHook) == Event_Processed ? nil : event; + result = FilterEvent(eventHook) == Event_Processed ? nil : event; } else { - return FilterEvent(wxevent) == Event_Processed ? nil : event; + result = FilterEvent(wxevent) == Event_Processed ? nil : event; } mEvent = nullptr; + return result; } }