Merge pull request #494 from Cysharp/hadashiA/web-req-null-check

Add check if UnityWebRequest was destroyed
Cysharp · Sep 7, 2023 · f203b6c · f203b6c
2 parents c1042b3 + 9135c7c
commit f203b6c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs
@@ -900,7 +900,11 @@ public bool MoveNext()
 
                 if (asyncOperation.isDone)
                 {
-                    if (asyncOperation.webRequest.IsError())
+                    if (asyncOperation.webRequest == null)
+                    {
+                        core.TrySetException(new ObjectDisposedException("The webRequest has been destroyed."));
+                    }
+                    else if (asyncOperation.webRequest.IsError())
                     {
                         core.TrySetException(new UnityWebRequestException(asyncOperation.webRequest));
                     }