Merge pull request #9 from thibaut-jarosz/master

Fixing Arc crash
indragiek · Feb 27, 2013 · 22ce1b9 · 22ce1b9
2 parents ab3ebe2 + b16c9d0
commit 22ce1b9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/INPopoverController.m b/INPopoverController.m
@@ -381,9 +381,11 @@ - (void)_closePopoverAndResetVariables
 	[self _setArrowDirection:INPopoverArrowDirectionUndefined];
 	[self _setPositionView:nil];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	[[_popoverWindow animationForKey:@"alphaValue"] setDelegate:nil];	// reset delegate so it doesn't retain us
 	_screenRect = NSZeroRect;
 	_viewRect = NSZeroRect;
+
+    // When using ARC and no animation, there is a "message sent to deallocated instance" crash if setDelegate: is not performed at the end of the event.
+    [[_popoverWindow animationForKey:@"alphaValue"] performSelector:@selector(setDelegate:) withObject:nil afterDelay:0];
 }
 
 - (void)_callDelegateMethod:(SEL)selector