From 9db0fe40a0e0d10c9eaca3584847da1d62e23fc3 Mon Sep 17 00:00:00 2001 From: Louis Pontoise Date: Fri, 7 Aug 2020 04:53:32 +0900 Subject: [PATCH] fix: shortcut would not register if capslock was on (closes #493) --- src/logic/events/KeyboardEvents.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/events/KeyboardEvents.swift b/src/logic/events/KeyboardEvents.swift index fdab0818..befdb1b3 100644 --- a/src/logic/events/KeyboardEvents.swift +++ b/src/logic/events/KeyboardEvents.swift @@ -62,7 +62,7 @@ private func shortcutThatMatches(_ event: NSEvent, _ type: CGEventType) -> Strin } } else if event.sr_keyEventType == .down && (shortcut.keyCode == .none || event.keyCode == shortcut.carbonKeyCode) { if shortcutId.hasPrefix("nextWindowShortcut") { - if event.modifierFlags.intersection(.deviceIndependentFlagsMask) == shortcut.modifierFlags && + if event.modifierFlags.intersection(.deviceIndependentFlagsMask).subtracting(.capsLock) == shortcut.modifierFlags && (!App.app.appIsBeingUsed || shortcutId == "nextWindowShortcut" + postfix) { return shortcutId }