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

Merge pull request #65 from vc-kusuha/fix_Timeout 

Fix timeoutTask continues to remain.
pull/75/head
Yoshifumi Kawai 2020-04-24 14:57:05 +09:00 committed by GitHub
parent b4ec35aadd 623936c7b8
commit 341953b441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/UniRx.Async/UniTaskExtensions.cs
View File

@ -101,7 +101,7 @@ namespace UniRx.Async
// left, right both suppress operation canceled exception. // left, right both suppress operation canceled exception.
var delayCancellationTokenSource = new CancellationTokenSource(); var delayCancellationTokenSource = new CancellationTokenSource();
var timeoutTask = (UniTask)UniTask.Delay(timeout, ignoreTimeScale, timeoutCheckTiming).SuppressCancellationThrow(); var timeoutTask = (UniTask)UniTask.Delay(timeout, ignoreTimeScale, timeoutCheckTiming, delayCancellationTokenSource.Token).SuppressCancellationThrow();
var (hasValue, value) = await UniTask.WhenAny(task.SuppressCancellationThrow(), timeoutTask); var (hasValue, value) = await UniTask.WhenAny(task.SuppressCancellationThrow(), timeoutTask);
@ -147,7 +147,7 @@ namespace UniRx.Async
// left, right both suppress operation canceled exception. // left, right both suppress operation canceled exception.
var delayCancellationTokenSource = new CancellationTokenSource(); var delayCancellationTokenSource = new CancellationTokenSource();
var timeoutTask = (UniTask)UniTask.Delay(timeout, ignoreTimeScale, timeoutCheckTiming).SuppressCancellationThrow(); var timeoutTask = (UniTask)UniTask.Delay(timeout, ignoreTimeScale, timeoutCheckTiming, delayCancellationTokenSource.Token).SuppressCancellationThrow();
var (hasValue, value) = await UniTask.WhenAny(task.SuppressCancellationThrow(), timeoutTask); var (hasValue, value) = await UniTask.WhenAny(task.SuppressCancellationThrow(), timeoutTask);