Merge branch 'develop' into fix/parameter-warning

nytimes · Mar 30, 2020 · 37d7634 · 37d7634
2 parents 45fc248 + 9757ae6
commit 37d7634
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Changes for users of the library currently on `develop`:
 
 - Removed `FLAnimatedImage` from .gitmodules.
 - Change `NYTPhotosViewController` to use fullscreen presentation by default, so it causes the presenting view to disappear behind it, i.e. to get `-viewWillDisappear:` and `-viewDidDisappear` called on it.
+- Fix unbalanced calls to begin/end appearance transitions.
 - Modified comment parameter in `NYTPhotosViewController` and `NYTPhotoViewerSinglePhotoDataSource` to match parameter in signature. Removes compilation warning.
 
 ## [4.0.0](https://github.com/nytimes/NYTPhotoViewer/releases/tag/4.0.0)

diff --git a/NYTPhotoViewer/NYTPhotoTransitionAnimator.m b/NYTPhotoViewer/NYTPhotoTransitionAnimator.m
@@ -266,8 +266,12 @@ + (UIView *)newAnimationViewFromView:(UIView *)view {
 
 #pragma mark - UIViewControllerAnimatedTransitioning
 - (void)animationEnded:(BOOL)transitionCompleted {
-    [self.toViewController endAppearanceTransition];
-    [self.fromViewController endAppearanceTransition];
+    if (self.toViewController.parentViewController) {
+        [self.toViewController endAppearanceTransition];
+    }
+    if (self.fromViewController.parentViewController) {
+        [self.fromViewController endAppearanceTransition];
+    }
 }
 
 - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {