nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 20:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed autotype hotkey getting registered without task

Browse Source
This commit is contained in:
michael starke
2014-08-20 01:23:36 +02:00
parent ac3a41e4a0
commit 6d690020ef
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/DDHotKey+Keydata.h
View File

@@ -13,6 +13,6 @@
+ (instancetype)defaultHotKey; + (instancetype)defaultHotKey;
+ (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task; + (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task;
- (NSData *)keyData; - (NSData *)keyData;
- (instancetype)initWithKeyData:(NSData *)data taks:(DDHotKeyTask)task; - (instancetype)initWithKeyData:(NSData *)data task:(DDHotKeyTask)task;
- (instancetype)initWithKeyData:(NSData *)data; - (instancetype)initWithKeyData:(NSData *)data;
@end @end

6
MacPass/DDHotKey+Keydata.m
View File

@@ -16,15 +16,15 @@
} }
+ (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task { + (instancetype)defaultHotKeyWithTask:(DDHotKeyTask)task {
return [[DDHotKey alloc] initWithKeyData:nil]; return [[DDHotKey alloc] initWithKeyData:nil task:task];
} }
- (instancetype)initWithKeyData:(NSData *)data { - (instancetype)initWithKeyData:(NSData *)data {
self = [self initWithKeyData:data taks:nil]; self = [self initWithKeyData:data task:nil];
return self; return self;
} }
- (instancetype)initWithKeyData:(NSData *)data taks:(DDHotKeyTask)task{ - (instancetype)initWithKeyData:(NSData *)data task:(DDHotKeyTask)task{
NSUInteger modifierFlags; NSUInteger modifierFlags;
unsigned short keyCode; unsigned short keyCode;
if(!data) { if(!data) {

2
MacPass/MPAutotypeDaemon.m
View File

@@ -200,7 +200,7 @@ NSString *const kMPApplciationNameKey = @"applicationName";
storedHotkey = [DDHotKey defaultHotKeyWithTask:aTask]; storedHotkey = [DDHotKey defaultHotKeyWithTask:aTask];
} }
else { else {
storedHotkey = [[DDHotKey alloc] initWithKeyData:self.hotKeyData taks:aTask]; storedHotkey = [[DDHotKey alloc] initWithKeyData:self.hotKeyData task:aTask];
} }
self.registredHotKey = [[DDHotKeyCenter sharedHotKeyCenter] registerHotKey:storedHotkey]; self.registredHotKey = [[DDHotKeyCenter sharedHotKeyCenter] registerHotKey:storedHotkey];
} }