diff options
| author | Vadim Shpakovski | 2013-03-06 13:53:45 +0300 |
|---|---|---|
| committer | Vadim Shpakovski | 2013-03-06 13:53:45 +0300 |
| commit | ffafb30498445cd5de120b5babab0d55a2e5be6d (patch) | |
| tree | 963e92defe23a84757d97cf512e4f1c90abe67fc | |
| parent | c6131623a7f3a25b11fe331597a7fdaca9706bf0 (diff) | |
| download | MASShortcut-ffafb30498445cd5de120b5babab0d55a2e5be6d.tar.bz2 | |
Fixing a bug with resetting user defaults.
| -rw-r--r-- | MASShortcut+UserDefaults.m | 4 | ||||
| -rw-r--r-- | MASShortcutView+UserDefaults.m | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/MASShortcut+UserDefaults.m b/MASShortcut+UserDefaults.m index 9330766..ed1531c 100644 --- a/MASShortcut+UserDefaults.m +++ b/MASShortcut+UserDefaults.m @@ -41,9 +41,9 @@ { NSData *shortcutData = shortcut.data; if (shortcutData) - [[NSUserDefaults standardUserDefaults] removeObjectForKey:userDefaultsKey]; - else [[NSUserDefaults standardUserDefaults] setObject:shortcutData forKey:userDefaultsKey]; + else + [[NSUserDefaults standardUserDefaults] removeObjectForKey:userDefaultsKey]; } @end diff --git a/MASShortcutView+UserDefaults.m b/MASShortcutView+UserDefaults.m index 42a2379..13bcb7c 100644 --- a/MASShortcutView+UserDefaults.m +++ b/MASShortcutView+UserDefaults.m @@ -15,22 +15,22 @@ @implementation MASShortcutView (UserDefaults) -void *kDefaultsObserver = &kDefaultsObserver; +void *MASAssociatedDefaultsObserver = &MASAssociatedDefaultsObserver; - (NSString *)associatedUserDefaultsKey { - MASShortcutDefaultsObserver *defaultsObserver = objc_getAssociatedObject(self, kDefaultsObserver); + MASShortcutDefaultsObserver *defaultsObserver = objc_getAssociatedObject(self, MASAssociatedDefaultsObserver); return defaultsObserver.userDefaultsKey; } - (void)setAssociatedUserDefaultsKey:(NSString *)associatedUserDefaultsKey { // First, stop observing previous shortcut view - objc_setAssociatedObject(self, kDefaultsObserver, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + objc_setAssociatedObject(self, MASAssociatedDefaultsObserver, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC); // Next, start observing current shortcut view MASShortcutDefaultsObserver *defaultsObserver = [[MASShortcutDefaultsObserver alloc] initWithShortcutView:self userDefaultsKey:associatedUserDefaultsKey]; - objc_setAssociatedObject(self, kDefaultsObserver, defaultsObserver, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + objc_setAssociatedObject(self, MASAssociatedDefaultsObserver, defaultsObserver, OBJC_ASSOCIATION_RETAIN_NONATOMIC); } @end |