From eaddcf6c097d24b25f77ba5c7aa8fb72c1710bb0 Mon Sep 17 00:00:00 2001 From: Philip Messlehner Date: Tue, 2 Jul 2013 14:58:59 +0200 Subject: [PATCH] fixed an Issue with ViewControllerContainment --- .../UIViewController+MMDrawerController.m | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/MMDrawerController/UIViewController+MMDrawerController.m b/MMDrawerController/UIViewController+MMDrawerController.m index 7ffc0542..d2ffe3b8 100644 --- a/MMDrawerController/UIViewController+MMDrawerController.m +++ b/MMDrawerController/UIViewController+MMDrawerController.m @@ -25,16 +25,14 @@ @implementation UIViewController (MMDrawerController) -(MMDrawerController*)mm_drawerController{ - if([self.parentViewController isKindOfClass:[MMDrawerController class]]){ - return (MMDrawerController*)self.parentViewController; - } - else if([self.parentViewController isKindOfClass:[UINavigationController class]] && - [self.parentViewController.parentViewController isKindOfClass:[MMDrawerController class]]){ - return (MMDrawerController*)[self.parentViewController parentViewController]; - } - else{ - return nil; + UIViewController *parentViewController = self.parentViewController; + while (parentViewController != nil) { + if([parentViewController isKindOfClass:[MMDrawerController class]]){ + return (MMDrawerController *)parentViewController; + } + parentViewController = parentViewController.parentViewController; } + return nil; } -(CGRect)mm_visibleDrawerFrame{