Merge pull request #70 from mutualmobile/mm_drawerController_Parent_I…

…mprovement Improved Parent DrawerController Detection
mutualmobile · Aug 12, 2013 · 297d7ec · 297d7ec
2 parents 08f720a + eaddcf6
commit 297d7ec
Showing 1 changed file with 7 additions and 9 deletions.
diff --git 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{