diff --git a/ImageViewer/ViewController.swift b/ImageViewer/ViewController.swift index 4da3b2a..c3aefa0 100644 --- a/ImageViewer/ViewController.swift +++ b/ImageViewer/ViewController.swift @@ -1637,11 +1637,13 @@ class ImageLoader { if token.isCancelled { finish(nil); return } - guard var image = UIImage(data: extractedData) else { + guard let image = UIImage(data: extractedData) else { finish(nil) return } + var finalImage: UIImage! + if token.isCancelled { finish(nil); return } // If you turn pages fast, completion will not be nil and as such only the needed scaled image should be prepared @@ -1661,7 +1663,7 @@ class ImageLoader { print("this should be unreachable") return } - if rotation == .vertical { image = vScaleImage } + if rotation == .vertical { finalImage = vScaleImage } } if token.isCancelled { finish(nil); return } @@ -1682,10 +1684,10 @@ class ImageLoader { print("this should be unreachable") return } - if rotation == .horizontal { image = hScaleImage } + if rotation == .horizontal { finalImage = hScaleImage } } - finish(image) + finish(finalImage) } }