From 9a6089af9b11b5d040eb9f71f6be1bd4700c9212 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 19 Jan 2017 13:40:05 +0300 Subject: [welcome] [ios] Fixed welcome controller crash. --- iphone/Maps/UI/Welcome/WelcomePageController.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift index dc8d63fcdf..a60d868c49 100644 --- a/iphone/Maps/UI/Welcome/WelcomePageController.swift +++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift @@ -21,10 +21,13 @@ final class WelcomePageController: UIPageViewController { return viewControllers?.first } set { - guard let controller = newValue else { return } + guard let controller = newValue, let parentView = parentController.view else { return } let animated = !isAnimatingTransition + parentView.isUserInteractionEnabled = isAnimatingTransition setViewControllers([controller], direction: .forward, animated: animated) { [weak self] _ in - self?.isAnimatingTransition = false + guard let s = self else { return } + s.isAnimatingTransition = false + parentView.isUserInteractionEnabled = true } isAnimatingTransition = animated } @@ -46,9 +49,9 @@ final class WelcomePageController: UIPageViewController { override func viewDidLoad() { super.viewDidLoad() - let parentView = parentController.view! view.backgroundColor = UIColor.white() if IPAD() { + let parentView = parentController.view! iPadBackgroundView = SolidTouchView(frame: parentView.bounds) iPadBackgroundView!.backgroundColor = UIColor.fadeBackground() iPadBackgroundView!.autoresizingMask = [.flexibleWidth, .flexibleHeight] -- cgit v1.2.3