Fixed potential crashes

davbeck · Mar 20, 2015 · a256b08 · a256b08
1 parent 0d09c9e
commit a256b08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Pod/Classes/PHImageManager+TNKRequestImages.m b/Pod/Classes/PHImageManager+TNKRequestImages.m
@@ -30,8 +30,10 @@ - (NSDictionary *)requestImagesForAssets:(NSArray *)assets
         dispatch_group_enter(group);
 
         PHImageRequestID requestID = [self requestImageForAsset:asset targetSize:targetSize contentMode:contentMode options:options resultHandler:^(UIImage *result, NSDictionary *info) {
-            results[asset.localIdentifier] = result;
-            infos[asset.localIdentifier] = info;
+            if (result != nil && info != nil) {
+                results[asset.localIdentifier] = result;
+                infos[asset.localIdentifier] = info;
+            }
 
             dispatch_group_leave(group);
         }];

diff --git a/Pod/Classes/TNKAssetImageView.m b/Pod/Classes/TNKAssetImageView.m
@@ -22,12 +22,14 @@ @implementation TNKAssetImageView
 
 - (void)setAsset:(PHAsset *)asset
 {
-    [self cancelAssetImageRequest];
-
-    _asset = asset;
-    self.image = self.defaultImage;
-
-    [self setNeedsAssetReload];
+    if (_asset != asset) {
+        [self cancelAssetImageRequest];
+
+        _asset = asset;
+        self.image = self.defaultImage;
+
+        [self setNeedsAssetReload];
+    }
 }
 
 - (void)setNeedsAssetReload