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

Merge pull request #115 from IllusionCui/master 

[addressable]:fix CancellationToken can't stop UniTask #114
pull/121/head
Yoshifumi Kawai 2020-07-16 05:37:01 +09:00 committed by GitHub
parent 9d3b7adc8e 65b6553a1a
commit 009715c0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
} }