From 549b3ef29edd64d3911968d381712500295da655 Mon Sep 17 00:00:00 2001
From: Antonin Hildebrand
Date: Tue, 26 Aug 2014 13:16:04 +0200
Subject: allow [MODIFIER]+ESC shortcuts

only naked ESC without modifiers should cancel editing

http://discuss.binaryage.com/t/cant-change-activation-key-to-control-esc

tested in TotalTerminal codebase
---
 MASShortcutView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MASShortcutView.m')

diff --git a/MASShortcutView.m b/MASShortcutView.m
index 82f4b4b..96dcc86 100644
--- a/MASShortcutView.m
+++ b/MASShortcutView.m
@@ -359,7 +359,7 @@ void *kUserDataHint = &kUserDataHint;
                 weakSelf.recording = NO;
                 event = nil;
             }
-            else if (shortcut.keyCode == kVK_Escape) {
+            else if (shortcut.keyCode == kVK_Escape && !shortcut.modifierFlags) {
                 // Cancel recording
                 weakSelf.recording = NO;
                 event = nil;
-- 
cgit v1.2.3