From 5ead539397ba9f939573b187fac825c61facd25c Mon Sep 17 00:00:00 2001
From: Roman Sokolov
Date: Sun, 9 Aug 2015 21:27:19 +0300
Subject: Fix

Fix problem: 
Set hotkey [TheSameHOTKEY], then mousedown on delete button, then set hotkey again  [TheSameHOTKEY], then this hotkey do not work.---
 Framework/MASShortcutBinder.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Framework/MASShortcutBinder.m b/Framework/MASShortcutBinder.m
index 92ba6e8..4c0d7f9 100644
--- a/Framework/MASShortcutBinder.m
+++ b/Framework/MASShortcutBinder.m
@@ -109,6 +109,7 @@
 
     // Just deleting the old shortcut
     if (newShortcut == nil) {
+        [_shortcuts removeObjectForKey:key];
         return;
     }
 
-- 
cgit v1.2.3


From c98154e2c38ba22221c86967f70a108a86303b29 Mon Sep 17 00:00:00 2001
From: Roman Sokolov
Date: Sun, 9 Aug 2015 21:55:03 +0300
Subject: fix for keyboard navigation

Tab key must pass through. This is important if you want to do keyboard navigation through this control.---
 Framework/MASShortcutView.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Framework/MASShortcutView.m b/Framework/MASShortcutView.m
index 4952b4f..7b67411 100644
--- a/Framework/MASShortcutView.m
+++ b/Framework/MASShortcutView.m
@@ -398,6 +398,11 @@ void *kUserDataHint = &kUserDataHint;
             // Create a shortcut from the event
             MASShortcut *shortcut = [MASShortcut shortcutWithEvent:event];
 
+            // Tab key must pass through.
+            if (shortcut.keyCode == kVK_Tab){
+                return event;
+            }
+
             // If the shortcut is a plain Delete or Backspace, clear the current shortcut and cancel recording
             if (!shortcut.modifierFlags && ((shortcut.keyCode == kVK_Delete) || (shortcut.keyCode == kVK_ForwardDelete))) {
                 weakSelf.shortcutValue = nil;
-- 
cgit v1.2.3