fix crashes with pager when swiping too fast

tarkalabs · Aug 19, 2016 · 186c19d · 186c19d
1 parent 555bdcc
commit 186c19d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ICViewPager/ICViewPager/ViewPagerController.m b/ICViewPager/ICViewPager/ViewPagerController.m
@@ -377,7 +377,7 @@ - (void)setActiveTabIndex:(NSUInteger)activeTabIndex {
 }
 
 - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
-
+    BOOL isTransitioning = NO;
     // Get the desired viewController
     UIViewController *viewController = [self viewControllerAtIndex:activeContentIndex];
 
@@ -392,19 +392,23 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
     __weak ViewPagerController *weakSelf = self;
 
     if (activeContentIndex == self.activeContentIndex) {
-
+
+      dispatch_async(dispatch_get_main_queue(), ^{
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:UIPageViewControllerNavigationDirectionForward
                                            animated:NO
                                          completion:^(BOOL completed) {
                                              weakSelf.animatingToTab = NO;
                                          }];
+      });
 
     } else if (!(activeContentIndex + 1 == self.activeContentIndex || activeContentIndex - 1 == self.activeContentIndex)) {
+
+      dispatch_async(dispatch_get_main_queue(), ^{
 
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:(activeContentIndex < self.activeContentIndex) ? UIPageViewControllerNavigationDirectionReverse : UIPageViewControllerNavigationDirectionForward
-                                           animated:YES
+                                           animated: NO
                                          completion:^(BOOL completed) {
 
                                              weakSelf.animatingToTab = NO;
@@ -417,15 +421,18 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
                                                                                  completion:nil];
                                              });
                                          }];
+      });
 
     } else {
-
+
+      dispatch_async(dispatch_get_main_queue(), ^{
         [self.pageViewController setViewControllers:@[viewController]
                                           direction:(activeContentIndex < self.activeContentIndex) ? UIPageViewControllerNavigationDirectionReverse : UIPageViewControllerNavigationDirectionForward
-                                           animated:YES
+                                           animated: NO
                                          completion:^(BOOL completed) {
                                              weakSelf.animatingToTab = NO;
                                          }];
+      });
     }
 
     // Clean out of sight contents