pengtaihao
/
UniTask
mirror of https://github.com/Cysharp/UniTask
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[addressable]:fix CancellationToken can't stop UniTask #114

pull/115/head
cuibeibei 2020-07-15 15:14:08 +08:00
parent 9d3b7adc8e
commit 65b6553a1a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs vendored
View File

@ -152,7 +152,11 @@ namespace Cysharp.Threading.Tasks
else else
{ {
completed = true; completed = true;
if (handle.Status == AsyncOperationStatus.Failed) if (cancellationToken.IsCancellationRequested)
{
core.TrySetCanceled(cancellationToken);
}
else if (handle.Status == AsyncOperationStatus.Failed)
{ {
core.TrySetException(handle.OperationException); core.TrySetException(handle.OperationException);
} }
@ -465,7 +469,11 @@ namespace Cysharp.Threading.Tasks
else else
{ {
completed = true; completed = true;
if (handle.Status == AsyncOperationStatus.Failed) if (cancellationToken.IsCancellationRequested)
{
core.TrySetCanceled(cancellationToken);
}
else if (handle.Status == AsyncOperationStatus.Failed)
{ {
core.TrySetException(handle.OperationException); core.TrySetException(handle.OperationException);
} }