Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix reference counting #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix reference counting #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b06f5a
Fix reference counting
aspcartman Feb 25, 2016
dfecad7
Fix observers leak
aspcartman Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions BIND/Classes/BNDBinding.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@interface BNDBindingKVOObserver : NSObject
@property (nonatomic, copy, readonly) NSString *keyPath;
@property (nonatomic, weak, readonly) BNDBinding *binding;
@property (nonatomic, strong, readonly) BNDBinding *binding;

+ (instancetype)observerWithKeyPath:(NSString *)keyPath
binding:(BNDBinding *)binding;
Expand All @@ -41,8 +41,8 @@ @interface BNDBinding ()
@property (nonatomic, strong) NSValueTransformer *valueTransformer;
@property (nonatomic) BOOL shouldSetInitialValues;

@property (nonatomic, strong) BNDBindingKVOObserver *leftObserver;
@property (nonatomic, strong) BNDBindingKVOObserver *rightObserver;
@property (nonatomic, weak) BNDBindingKVOObserver *leftObserver;
@property (nonatomic, weak) BNDBindingKVOObserver *rightObserver;

@property (nonatomic) SEL transformSelector;
@property (nonatomic) SEL reverseTransformSelector;
Expand Down Expand Up @@ -273,15 +273,17 @@ - (void)setupObservers {
[self removeObservers];
if (self.direction == BNDBindingDirectionLeftToRight ||
self.direction == BNDBindingDirectionBoth) {
self.leftObserver = [BNDBindingKVOObserver observerWithKeyPath:self.leftKeyPath
binding:self];
BNDBindingKVOObserver *observer = [BNDBindingKVOObserver observerWithKeyPath:self.leftKeyPath
binding:self];
self.leftObserver = observer;
[self.leftObserver observe:self.leftObject];
}

if (self.direction == BNDBindingDirectionRightToLeft ||
self.direction == BNDBindingDirectionBoth) {
self.rightObserver = [BNDBindingKVOObserver observerWithKeyPath:self.rightKeyPath
binding:self];
BNDBindingKVOObserver *observer = [BNDBindingKVOObserver observerWithKeyPath:self.rightKeyPath
binding:self];
self.rightObserver = observer;
[self.rightObserver observe:self.rightObject];
}
}
Expand Down