fix(_DTXTimerTrampoline): Correct removal of display link associated …

…object
wix-incubator · Apr 18, 2022 · 6571ef0 · 6571ef0
1 parent 9a8d925
commit 6571ef0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/DetoxSync/DetoxSync/Utils/_DTXTimerTrampoline.m b/DetoxSync/DetoxSync/Utils/_DTXTimerTrampoline.m
@@ -88,7 +88,15 @@ - (void)dealloc
 {
 	NSLog(@"🤦‍♂️ trampoline dealloc: %@ (tracking: %d)", self, _tracking);
 
-	objc_setAssociatedObject(_timer, __DTXTimerTrampolineKey, nil, OBJC_ASSOCIATION_RETAIN);
+    if(_timer)
+    {
+        objc_setAssociatedObject(_timer, __DTXTimerTrampolineKey, nil, OBJC_ASSOCIATION_ASSIGN);
+    }
+
+    if(_displayLink)
+    {
+        objc_setAssociatedObject(_displayLink, __DTXTimerTrampolineKey, nil, OBJC_ASSOCIATION_ASSIGN);
+    }
 }
 
 - (void)setTimer:(NSTimer*)timer
@@ -105,7 +113,7 @@ - (void)setTimer:(NSTimer*)timer
 - (void)setDisplayLink:(CADisplayLink*)displayLink
 {
 	_displayLink = displayLink;
-	objc_setAssociatedObject(_displayLink, __DTXTimerTrampolineKey, self, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+	objc_setAssociatedObject(_displayLink, __DTXTimerTrampolineKey, self, OBJC_ASSOCIATION_RETAIN);
 
 #if DEBUG
 	_history = [NSString stringWithFormat:@"%@\n%@", _history, [displayLink debugDescription]];