diff options
Diffstat (limited to 'MASShortcut.m')
| -rw-r--r-- | MASShortcut.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MASShortcut.m b/MASShortcut.m index 4e9888d..5b94310 100644 --- a/MASShortcut.m +++ b/MASShortcut.m @@ -322,9 +322,11 @@ BOOL MASShortcutAllowsAnyHotkeyWithOptionModifier = NO; CFDictionaryRef hotKeyInfo = CFArrayGetValueAtIndex(globalHotKeys, i); CFNumberRef code = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyCode); CFNumberRef flags = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyModifiers); + CFNumberRef enabled = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyEnabled); if (([(__bridge NSNumber *)code unsignedIntegerValue] == self.keyCode) && - ([(__bridge NSNumber *)flags unsignedIntegerValue] == self.carbonFlags)) { + ([(__bridge NSNumber *)flags unsignedIntegerValue] == self.carbonFlags) && + ([(__bridge NSNumber *)enabled boolValue])) { if (outError) { NSString *description = NSLocalizedString(@"This combination cannot be used because it is already used by a system-wide " |