From 7ca81d0e36612a7df27fcdace61aca157963cc83 Mon Sep 17 00:00:00 2001 From: Bill Burgess Date: Tue, 29 Apr 2014 10:13:28 -0500 Subject: [PATCH] Updated bitwise operator to correctly find option if more than 1 are included --- SDWebImage/UIImageView+WebCache.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDWebImage/UIImageView+WebCache.m b/SDWebImage/UIImageView+WebCache.m index f425506..2e2fb9d 100644 --- a/SDWebImage/UIImageView+WebCache.m +++ b/SDWebImage/UIImageView+WebCache.m @@ -41,7 +41,7 @@ static char operationArrayKey; - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock { [self cancelCurrentImageLoad]; - if (options != SDWebImageDelayPlaceholder) { + if (!(options & SDWebImageDelayPlaceholder)) { self.image = placeholder; } @@ -55,7 +55,7 @@ static char operationArrayKey; wself.image = image; [wself setNeedsLayout]; } else { - if (options == SDWebImageDelayPlaceholder) { + if (options & SDWebImageDelayPlaceholder) { wself.image = placeholder; [wself setNeedsLayout]; }