diff --git a/YYWebImage/Categories/UIImageView+YYWebImage.m b/YYWebImage/Categories/UIImageView+YYWebImage.m index 1719a12..e7dd65b 100644 --- a/YYWebImage/Categories/UIImageView+YYWebImage.m +++ b/YYWebImage/Categories/UIImageView+YYWebImage.m @@ -287,21 +287,22 @@ - (void)yy_setHighlightedImageWithURL:(NSURL *)imageURL // get the image from memory as quickly as possible UIImage *imageFromMemory = nil; - if (manager.cache && - !(options & YYWebImageOptionUseNSURLCache) && - !(options & YYWebImageOptionRefreshImageCache)) { + if (manager.cache) { imageFromMemory = [manager.cache getImageForKey:[manager cacheKeyForURL:imageURL] withType:YYImageCacheTypeMemory]; } + if (imageFromMemory) { if (!(options & YYWebImageOptionAvoidSetImage)) { - self.highlightedImage = imageFromMemory; + self.image = imageFromMemory; + } + if (!(options & YYWebImageOptionRefreshImageCache) && !(options & YYWebImageOptionUseNSURLCache)) { + if(completion) completion(imageFromMemory, imageURL, YYWebImageFromMemoryCacheFast, YYWebImageStageFinished, nil); + return; + } + } else { + if (!(options & YYWebImageOptionIgnorePlaceHolder)) { + self.image = placeholder; } - if(completion) completion(imageFromMemory, imageURL, YYWebImageFromMemoryCacheFast, YYWebImageStageFinished, nil); - return; - } - - if (!(options & YYWebImageOptionIgnorePlaceHolder)) { - self.highlightedImage = placeholder; } __weak typeof(self) _self = self;