From 7432c0073a000712f29d9fdf66816cbc8437a4dd Mon Sep 17 00:00:00 2001 From: hikari Date: Mon, 24 Aug 2020 17:10:26 +0900 Subject: [PATCH 1/2] Fix ToCancellationToken linkToken --- .../Plugins/UniTask/Runtime/CancellationTokenExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs index c139acc..6575432 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs @@ -33,7 +33,7 @@ namespace Cysharp.Threading.Tasks var cts = new CancellationTokenSource(); ToCancellationTokenCore(task, cts).Forget(); - return CancellationTokenSource.CreateLinkedTokenSource(linkToken).Token; + return CancellationTokenSource.CreateLinkedTokenSource(cts.Token, linkToken).Token; } public static CancellationToken ToCancellationToken(this UniTask task) From 3bad5cd2bff2a041a1c0127562211e9d47825c13 Mon Sep 17 00:00:00 2001 From: hikari Date: Tue, 25 Aug 2020 02:55:09 +0900 Subject: [PATCH 2/2] fixup! Fix ToCancellationToken linkToken --- .../Plugins/UniTask/Runtime/CancellationTokenExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs index 6575432..3f3a532 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs @@ -30,10 +30,10 @@ namespace Cysharp.Threading.Tasks return ToCancellationToken(task); } - var cts = new CancellationTokenSource(); + var cts = CancellationTokenSource.CreateLinkedTokenSource(linkToken); ToCancellationTokenCore(task, cts).Forget(); - return CancellationTokenSource.CreateLinkedTokenSource(cts.Token, linkToken).Token; + return cts.Token; } public static CancellationToken ToCancellationToken(this UniTask task)