From 97becca231065d003f37103e018c5b8b0126832c Mon Sep 17 00:00:00 2001 From: Roberto Frontado Date: Fri, 9 Nov 2018 09:56:05 +0100 Subject: [PATCH] Oops --- Library/OkPagerView.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/OkPagerView.swift b/Library/OkPagerView.swift index 2649b18..7bb2fe7 100644 --- a/Library/OkPagerView.swift +++ b/Library/OkPagerView.swift @@ -98,7 +98,7 @@ open class OkPagerView: UIView, UIPageViewControllerDataSource, UIPageViewContro } // Create a new View Controller and pass suitable data. - guard let viewController = dataSource.viewControllerAtIndex(index) else { + guard let viewController = dataSource?.viewControllerAtIndex(index) else { return nil } @@ -190,10 +190,8 @@ open class OkPagerView: UIView, UIPageViewControllerDataSource, UIPageViewContro // MARK: - UIPageViewControllerDelegate open func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) { if completed { - if let pageVC = pageViewController.viewControllers?.last as? UIViewController { - if let delegate = delegate { - delegate.onPageSelected(pageVC, index: pageVC.view.tag) - } + if let pageVC = pageViewController.viewControllers?.last { + delegate?.onPageSelected(pageVC, index: pageVC.view.tag) // Save currentIndex currentIndex = pageVC.view.tag pageControl?.currentPage = currentIndex