#817 (three column layout)

- Fixed sporadic crash when changing pages.
samuelclay · Jan 16, 2021 · 8d372f2 · 8d372f2
1 parent abe171c
commit 8d372f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/clients/ios/Classes/DetailViewController.swift b/clients/ios/Classes/DetailViewController.swift
@@ -195,6 +195,8 @@ class DetailViewController: DetailObjCViewController {
             viewController.horizontalPageViewController = horizontalPageViewController
             viewController.currentController = makeStoryController(for: -2)
 
+            print("DetailViewController setViewControllers: \(String(describing: viewController))")
+
             horizontalPageViewController?.setViewControllers([viewController], direction: .forward, animated: false, completion: nil)
         }
     }

diff --git a/clients/ios/Classes/HorizontalPageViewController.swift b/clients/ios/Classes/HorizontalPageViewController.swift
@@ -48,8 +48,15 @@ class HorizontalPageViewController: UIPageViewController {
     }
 
     override func setViewControllers(_ viewControllers: [UIViewController]?, direction: UIPageViewController.NavigationDirection, animated: Bool, completion: ((Bool) -> Void)? = nil) {
+        guard self.viewControllers != viewControllers else {
+            print("HorizontalPageViewController setViewControllers: \(String(describing: viewControllers)), ignoring as already set")
+            return
+        }
+
         reset()
 
+        print("HorizontalPageViewController setViewControllers: \(String(describing: viewControllers)), current: \(String(describing: self.viewControllers))")
+
         super.setViewControllers(viewControllers, direction: direction, animated: animated, completion: completion)
     }
 }
diff --git a/clients/ios/Classes/VerticalPageViewController.swift b/clients/ios/Classes/VerticalPageViewController.swift
@@ -89,8 +89,15 @@ class VerticalPageViewController: UIPageViewController {
     }
 
     override func setViewControllers(_ viewControllers: [UIViewController]?, direction: UIPageViewController.NavigationDirection, animated: Bool, completion: ((Bool) -> Void)? = nil) {
+        guard self.viewControllers != viewControllers else {
+            print("VerticalPageViewController setViewControllers: \(String(describing: viewControllers)), ignoring as already set")
+            return
+        }
+
         reset()
 
+        print("VerticalPageViewController setViewControllers: \(String(describing: viewControllers)), current: \(String(describing: self.viewControllers))")
+
         super.setViewControllers(viewControllers, direction: direction, animated: animated, completion: completion)
     }
 }