From ea69d5939511f61a7082ba1e8ff46d247862a3fa Mon Sep 17 00:00:00 2001
From: Tomáš Znamenáček
Date: Thu, 8 Jan 2015 10:50:08 +0100
Subject: Ignore disabled system shortcuts.

This was implemented before in 0633545a, but lost during the rebase.
---
 Framework/MASShortcutValidator.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Framework/MASShortcutValidator.m b/Framework/MASShortcutValidator.m
index 1db3ed9..47dd700 100644
--- a/Framework/MASShortcutValidator.m
+++ b/Framework/MASShortcutValidator.m
@@ -88,9 +88,11 @@
             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] == [shortcut keyCode]) &&
-                ([(__bridge NSNumber *)flags unsignedIntegerValue] == [shortcut carbonFlags])) {
+                ([(__bridge NSNumber *)flags unsignedIntegerValue] == [shortcut carbonFlags]) &&
+                ([(__bridge NSNumber *)enabled boolValue])) {
 
                 if (explanation) {
                     *explanation = NSLocalizedString(@"This combination cannot be used because it is already used by a system-wide "
-- 
cgit v1.2.3