Commit 7358fa97 authored by 汪洋's avatar 汪洋

增加数组越界判断

parent 86d3092a
...@@ -27,13 +27,16 @@ ...@@ -27,13 +27,16 @@
objc_setAssociatedObject(self, @"gmSnapshot", snapshot, OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(self, @"gmSnapshot", snapshot, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
} }
// TODO: wangyang 从 release 分支看一下此处的逻辑,查清此处应该怎么改
- (void)popToPresentPreviousController { - (void)popToPresentPreviousController {
for (int index = 0; index < self.navigationController.viewControllers.count; index++) { for (int index = 0; index < self.navigationController.viewControllers.count; index++) {
UIViewController *controller = self.navigationController.viewControllers[index]; UIViewController *controller = self.navigationController.viewControllers[index];
if ([controller conformsToProtocol:@protocol(GMCustomNavigationAnimationProtocol)]) { if ([controller conformsToProtocol:@protocol(GMCustomNavigationAnimationProtocol)]) {
if (index - 1 >= 0) {
UIViewController *previewController = self.navigationController.viewControllers[index - 1]; UIViewController *previewController = self.navigationController.viewControllers[index - 1];
[controller.navigationController popToViewController:previewController animated:YES]; [controller.navigationController popToViewController:previewController animated:YES];
} else {
[controller.navigationController popViewControllerAnimated:YES];
}
return; return;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment