From 0633545a4666d969dfbb860e540eb3b008893651 Mon Sep 17 00:00:00 2001
From: Vadim Shpakovski
Date: Tue, 2 Sep 2014 09:43:53 +0300
Subject: Ignoring disabled system shortcuts.

---
 MASShortcut.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 "
-- 
cgit v1.2.3