Merge remote-tracking branch 'origin/master'

master
neuecc 2020-07-16 05:37:08 +09:00
commit 023894d45e
1 changed files with 10 additions and 2 deletions

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);
} }