NullReferenceException fixes

IvanMurzak · May 10, 2024 · 1e8ad15 · 1e8ad15
1 parent c1d830e
commit 1e8ad15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Assets/_PackageRoot/Runtime/Future/Future.ThenSet.cs b/Assets/_PackageRoot/Runtime/Future/Future.ThenSet.cs
@@ -77,7 +77,7 @@ public static Future<Sprite> ThenSet(this Future<Sprite> future, params Image[]
         /// <param name="images">Array of RawImages</param>
         /// <returns>Returns async Future</returns>
         public static Future<Sprite> ThenSet(this Future<Sprite> future, params RawImage[] rawImages)
-            => future.ThenSet((target, sprite) => target.texture = sprite.texture, rawImages);
+            => future.ThenSet((target, sprite) => target.texture = sprite?.texture, rawImages);
 
         /// <summary>
         /// Set image into array of SpriteRenderers
@@ -93,6 +93,6 @@ public static Future<Sprite> ThenSet(this Future<Sprite> future, params SpriteRe
         /// <param name="images">Array of Materials</param>
         /// <returns>Returns async Future</returns>
         public static Future<Sprite> ThenSet(this Future<Sprite> future, string propertyName = "_MainTex", params Material[] materials)
-            => future.ThenSet((target, sprite) => target.SetTexture(propertyName, sprite.texture), materials);
+            => future.ThenSet((target, sprite) => target.SetTexture(propertyName, sprite?.texture), materials);
     }
 }
diff --git a/Assets/_PackageRoot/Runtime/Future/Future.ThenSetRef.cs b/Assets/_PackageRoot/Runtime/Future/Future.ThenSetRef.cs
@@ -47,7 +47,7 @@ public static Future<Reference<Sprite>> ThenSet<T>(this Future<Reference<Sprite>
                         setter?.Invoke(target, reference);
 
                         if (target is Component monoBehaviour)
-                            reference.AddTo(monoBehaviour.GetCancellationTokenOnDestroy());
+                            reference?.AddTo(monoBehaviour.GetCancellationTokenOnDestroy());
                     }
                 });
             });
@@ -59,30 +59,30 @@ public static Future<Reference<Sprite>> ThenSet<T>(this Future<Reference<Sprite>
         /// <param name="images">Array of Images</param>
         /// <returns>Returns async Future</returns>
         public static Future<Reference<Sprite>> ThenSet(this Future<Reference<Sprite>> future, params Image[] images)
-            => future.ThenSet((target, reference) => target.sprite = reference.Value, images);
+            => future.ThenSet((target, reference) => target.sprite = reference?.Value, images);
 
         /// <summary>
         /// Set image into array of RawImages
         /// </summary>
         /// <param name="images">Array of RawImages</param>
         /// <returns>Returns async Future</returns>
         public static Future<Reference<Sprite>> ThenSet(this Future<Reference<Sprite>> future, params RawImage[] rawImages)
-            => future.ThenSet((target, reference) => target.texture = reference.Value.texture, rawImages);
+            => future.ThenSet((target, reference) => target.texture = reference?.Value?.texture, rawImages);
 
         /// <summary>
         /// Set image into array of SpriteRenderers
         /// </summary>
         /// <param name="images">Array of SpriteRenderers</param>
         /// <returns>Returns async Future</returns>
         public static Future<Reference<Sprite>> ThenSet(this Future<Reference<Sprite>> future, params SpriteRenderer[] spriteRenderers)
-            => future.ThenSet((target, reference) => target.sprite = reference.Value, spriteRenderers);
+            => future.ThenSet((target, reference) => target.sprite = reference?.Value, spriteRenderers);
 
         /// <summary>
         /// Set image into array of Materials
         /// </summary>
         /// <param name="images">Array of Materials</param>
         /// <returns>Returns async Future</returns>
         public static Future<Reference<Sprite>> ThenSet(this Future<Reference<Sprite>> future, string propertyName = "_MainTex", params Material[] materials)
-            => future.ThenSet((target, reference) => target.SetTexture(propertyName, reference.Value.texture), materials);
+            => future.ThenSet((target, reference) => target.SetTexture(propertyName, reference?.Value?.texture), materials);
     }
 }
diff --git a/Assets/_PackageRoot/package.json b/Assets/_PackageRoot/package.json
@@ -5,7 +5,7 @@
         "name": "Ivan Murzak",
         "url": "https://github.com/IvanMurzak"
     },
-    "version": "5.1.1",
+    "version": "5.1.2",
     "unity": "2019.2",
     "description": "Asynchronous image loading from remote or local destination. It has two layers of configurable Memory and Disk cache systems.",
     "dependencies": {