diff --git a/Classes/FlipBoardNavigationController.m b/Classes/FlipBoardNavigationController.m index 08b5d04..f7ba3b8 100644 --- a/Classes/FlipBoardNavigationController.m +++ b/Classes/FlipBoardNavigationController.m @@ -223,7 +223,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive } - (BOOL) gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - return YES; + return NO; } #pragma mark - Handle Panning Activity @@ -328,18 +328,14 @@ @implementation UIViewController (FlipBoardNavigationController) - (FlipBoardNavigationController *)flipboardNavigationController { - - if([self.parentViewController isKindOfClass:[FlipBoardNavigationController class]]){ - return (FlipBoardNavigationController*)self.parentViewController; - } - else if([self.parentViewController isKindOfClass:[UINavigationController class]] && - [self.parentViewController.parentViewController isKindOfClass:[FlipBoardNavigationController class]]){ - return (FlipBoardNavigationController*)[self.parentViewController parentViewController]; - } - else{ - return nil; + UIViewController *parentViewController = self.parentViewController; + while (parentViewController != nil) { + if([parentViewController isKindOfClass:[FlipBoardNavigationController class]]){ + return (FlipBoardNavigationController *)parentViewController; + } + parentViewController = parentViewController.parentViewController; } - + return nil; }