From 6d690020efa6d449641352745960a9ef305e2d0c Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 20 Aug 2014 01:23:36 +0200 Subject: [PATCH] Fixed autotype hotkey getting registered without task --- MacPass/DDHotKey+Keydata.h | 2 +- MacPass/DDHotKey+Keydata.m | 6 +++--- MacPass/MPAutotypeDaemon.m | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MacPass/DDHotKey+Keydata.h b/MacPass/DDHotKey+Keydata.h index 73697c44..685661ab 100644 --- a/MacPass/DDHotKey+Keydata.h +++ b/MacPass/DDHotKey+Keydata.h @@ -13,6 +13,6 @@ + (instancetype)defaultHotKey; + (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task; - (NSData *)keyData; -- (instancetype)initWithKeyData:(NSData *)data taks:(DDHotKeyTask)task; +- (instancetype)initWithKeyData:(NSData *)data task:(DDHotKeyTask)task; - (instancetype)initWithKeyData:(NSData *)data; @end diff --git a/MacPass/DDHotKey+Keydata.m b/MacPass/DDHotKey+Keydata.m index e29bd887..32785d7a 100644 --- a/MacPass/DDHotKey+Keydata.m +++ b/MacPass/DDHotKey+Keydata.m @@ -16,15 +16,15 @@ } + (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task { - return [[DDHotKey alloc] initWithKeyData:nil]; + return [[DDHotKey alloc] initWithKeyData:nil task:task]; } - (instancetype)initWithKeyData:(NSData *)data { - self = [self initWithKeyData:data taks:nil]; + self = [self initWithKeyData:data task:nil]; return self; } -- (instancetype)initWithKeyData:(NSData *)data taks:(DDHotKeyTask)task{ +- (instancetype)initWithKeyData:(NSData *)data task:(DDHotKeyTask)task{ NSUInteger modifierFlags; unsigned short keyCode; if(!data) { diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m index e729779a..521696b6 100644 --- a/MacPass/MPAutotypeDaemon.m +++ b/MacPass/MPAutotypeDaemon.m @@ -200,7 +200,7 @@ NSString *const kMPApplciationNameKey = @"applicationName"; storedHotkey = [DDHotKey defaultHotKeyWithTask:aTask]; } else { - storedHotkey = [[DDHotKey alloc] initWithKeyData:self.hotKeyData taks:aTask]; + storedHotkey = [[DDHotKey alloc] initWithKeyData:self.hotKeyData task:aTask]; } self.registredHotKey = [[DDHotKeyCenter sharedHotKeyCenter] registerHotKey:storedHotkey]; }