Fix potential updateTrackingAreas bug with tooltips and cells

jwilling · Aug 26, 2016 · 952ca56 · 952ca56
1 parent 0891d13
commit 952ca56
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/JNWCollectionView/JNWCollectionViewCell.m b/JNWCollectionView/JNWCollectionViewCell.m
@@ -69,6 +69,7 @@ - (void)updateLayer {
 
 @interface JNWCollectionViewCell()
 @property (nonatomic, strong) JNWCollectionViewCellBackgroundView *backgroundView;
+@property (nonatomic, strong) NSTrackingArea *trackingArea;
 @end
 
 @implementation JNWCollectionViewCell
@@ -120,13 +121,13 @@ - (void)didLayoutWithFrame:(CGRect)frame {
 
 - (void)updateTrackingAreas {
 	[super updateTrackingAreas];
-	[[self.trackingAreas copy] enumerateObjectsUsingBlock:^(NSTrackingArea * _Nonnull trackingArea, NSUInteger idx, BOOL * _Nonnull stop) {
-		[self removeTrackingArea:trackingArea];
-	}];
+	if (self.trackingArea) {
+		[self removeTrackingArea:self.trackingArea];
+	}
 
 	NSTrackingAreaOptions options = (NSTrackingActiveAlways | NSTrackingInVisibleRect | NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved);
-	NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect:[self bounds] options:options owner:self userInfo:nil];
-	[self addTrackingArea:area];
+	self.trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds] options:options owner:self userInfo:nil];
+	[self addTrackingArea:self.trackingArea];
 }
 
 - (NSView *)contentView {