diff options
| author | Vadim Shpakovski | 2014-09-02 09:43:53 +0300 |
|---|---|---|
| committer | Vadim Shpakovski | 2014-09-02 09:43:53 +0300 |
| commit | 0633545a4666d969dfbb860e540eb3b008893651 (patch) | |
| tree | 17b5fd0cc7ebec6ff780199d04eb148779c63f69 | |
| parent | b30a0b02c4287f2ecc14b5680497fb807b1c364d (diff) | |
| download | MASShortcut-0633545a4666d969dfbb860e540eb3b008893651.tar.bz2 | |
Ignoring disabled system shortcuts.
| -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 " |