diff options
| author | Vadim Shpakovski | 2014-08-27 12:39:43 +0300 |
|---|---|---|
| committer | Vadim Shpakovski | 2014-08-27 12:39:43 +0300 |
| commit | b30a0b02c4287f2ecc14b5680497fb807b1c364d (patch) | |
| tree | 7e2f53f574a9231199fbfeb0e3e2b2be3769d9e8 | |
| parent | f3a8a9a95aad78ef4b15aacb4c9d5807bccd974f (diff) | |
| parent | 549b3ef29edd64d3911968d381712500295da655 (diff) | |
| download | MASShortcut-b30a0b02c4287f2ecc14b5680497fb807b1c364d.tar.bz2 | |
Merge pull request #43 from darwin/master
allow [MODIFIER]+ESC shortcuts
| -rw-r--r-- | MASShortcutView.m | 2 |
1 files changed, 1 insertions, 1 deletions
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; |