diff options
| author | Paulo F. Andrade | 2014-09-17 16:47:37 +0100 |
|---|---|---|
| committer | Paulo F. Andrade | 2014-09-17 16:47:37 +0100 |
| commit | 724376092de61df8cb90b5b5d81ae0c30bcd1b24 (patch) | |
| tree | 7f62cd0891ef21504407f01b91b5e0877b9ae00e /MASShortcut.m | |
| parent | da2773633059df112bd3c25fc8ae633f73c9f42b (diff) | |
| parent | a5c2e159354c8474579d96971a9103f3f11c1e39 (diff) | |
| download | MASShortcut-724376092de61df8cb90b5b5d81ae0c30bcd1b24.tar.bz2 | |
Updated MASShortcut
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 8790ac6..b217a98 100644 --- a/MASShortcut.m +++ b/MASShortcut.m @@ -327,9 +327,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 " |