From 53bf66a522b952e76b7c915d4796517d1776dda8 Mon Sep 17 00:00:00 2001 From: Karol Majka Date: Sat, 23 Nov 2019 19:11:30 +0100 Subject: [PATCH 1/2] iOS 13 Freeze screen fix According to this issue https://github.com/alexhillc/AXPhotoViewer/issues/71 Change fix freezing problem when permission to gallery was refused. --- .../Classes/View Controllers/AXPhotosViewController.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Classes/View Controllers/AXPhotosViewController.swift b/Source/Classes/View Controllers/AXPhotosViewController.swift index 3f657f5..4cce798 100644 --- a/Source/Classes/View Controllers/AXPhotosViewController.swift +++ b/Source/Classes/View Controllers/AXPhotosViewController.swift @@ -487,8 +487,10 @@ import FLAnimatedImage_tvOS // MARK: - Dismissal open override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) { - if self.presentedViewController != nil { - super.dismiss(animated: flag, completion: completion) + if let presentedViewController = self.presentedViewController { + presentedViewController.dismiss(animated: flag, completion: { + completion?() + }) return } From afec33b0490752e8bff567238ee3713510cbc7ff Mon Sep 17 00:00:00 2001 From: Karol Majka Date: Tue, 4 Feb 2020 21:38:56 +0100 Subject: [PATCH 2/2] Clean up code --- .../Classes/View Controllers/AXPhotosViewController.swift | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/Classes/View Controllers/AXPhotosViewController.swift b/Source/Classes/View Controllers/AXPhotosViewController.swift index 4cce798..95f101d 100644 --- a/Source/Classes/View Controllers/AXPhotosViewController.swift +++ b/Source/Classes/View Controllers/AXPhotosViewController.swift @@ -487,11 +487,8 @@ import FLAnimatedImage_tvOS // MARK: - Dismissal open override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) { - if let presentedViewController = self.presentedViewController { - presentedViewController.dismiss(animated: flag, completion: { - completion?() - }) - return + if let presentedViewController = presentedViewController { + return presentedViewController.dismiss(animated: flag, completion: completion) } self.delegate?.photosViewControllerWillDismiss?(self)