foldcc/UniTask
1
0
Fork 0
mirror of https://github.com/Cysharp/UniTask.git synced 2026-05-16 12:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
neuecc
2020-07-16 05:37:08 +09:00
parent c2824027d4 009715c0da
commit 023894d45e
1 changed files with 10 additions and 2 deletions
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
{
completed = true;
if (handle.Status == AsyncOperationStatus.Failed)
if (cancellationToken.IsCancellationRequested)
{
core.TrySetCanceled(cancellationToken);
}
else if (handle.Status == AsyncOperationStatus.Failed)
{
core.TrySetException(handle.OperationException);
}
@@ -465,7 +469,11 @@ namespace Cysharp.Threading.Tasks
else
{
completed = true;
if (handle.Status == AsyncOperationStatus.Failed)
if (cancellationToken.IsCancellationRequested)
{
core.TrySetCanceled(cancellationToken);
}
else if (handle.Status == AsyncOperationStatus.Failed)
{
core.TrySetException(handle.OperationException);
}