'Don't pop last controller' issue fixed

bfolder · May 2, 2012 · 5b53206 · 5b53206
1 parent 2a543d0
commit 5b53206
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/BFNavigationController.m b/BFNavigationController.m
@@ -254,16 +254,17 @@ -(NSArray *)popToViewController: (NSViewController *)viewController animated: (B
         return nil;
 
     NSViewController *visibleController = self.visibleViewController;
+
+    // Don't pop last controller
+    if(visibleController == viewController)
+        return nil;
+
     NSUInteger index = [_viewControllers indexOfObject: viewController];
     NSUInteger length = [_viewControllers count] - (index + 1);
     NSRange range = NSMakeRange(index + 1, length);
     NSArray *dispControllers = [_viewControllers subarrayWithRange: range];
     [_viewControllers removeObjectsInArray: dispControllers];
 
-    // Don't pop last controller
-    if(visibleController == viewController)
-        return nil;
-
     // Navigate
     [self _navigateFromViewController: visibleController toViewController: viewController animated: animated push: NO];
 

diff --git a/...odeproj/project.xcworkspace/xcuserdata/bfolder.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/bfolder.xcuserdatad/UserInterfaceState.xcuserstate