Release handle when cancellation is requested

Cysharp · Nov 22, 2023 · 36ac086 · 36ac086
1 parent 5cc97c7
commit 36ac086
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...iTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs b/...iTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
+using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
 
 namespace Cysharp.Threading.Tasks
@@ -171,6 +172,10 @@ void Continuation(AsyncOperationHandle _)
                     completed = true;
                     if (cancellationToken.IsCancellationRequested)
                     {
+                        If (handle.IsValid())
+                        {
+                            Addressables.Release(handle);
+                        }
                         core.TrySetCanceled(cancellationToken);
                     }
                     else if (handle.Status == AsyncOperationStatus.Failed)
@@ -215,6 +220,10 @@ public bool MoveNext()
                 if (cancellationToken.IsCancellationRequested)
                 {
                     completed = true;
+                    if (handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
                     core.TrySetCanceled(cancellationToken);
                     return false;
                 }
@@ -353,6 +362,10 @@ void Continuation(AsyncOperationHandle<T> argHandle)
                     completed = true;
                     if (cancellationToken.IsCancellationRequested)
                     {
+                        if (handle.IsValid())
+                        {
+                            Addressables.Release(handle);
+                        }
                         core.TrySetCanceled(cancellationToken);
                     }
                     else if (argHandle.Status == AsyncOperationStatus.Failed)
@@ -402,6 +415,10 @@ public bool MoveNext()
                 if (cancellationToken.IsCancellationRequested)
                 {
                     completed = true;
+                    if (handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
                     core.TrySetCanceled(cancellationToken);
                     return false;
                 }

diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef
@@ -2,7 +2,8 @@
     "name": "UniTask.Addressables",
     "references": [
         "UniTask",
-        "Unity.ResourceManager"
+        "Unity.ResourceManager",
+        "Unity.Addressables"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],