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

Merge pull request #220 from taigacon/master

Browse Source 
Fix using AsyncUnityEventHandler with a already canceled token
This commit is contained in:
Yoshifumi Kawai
2021-02-08 14:51:21 +09:00
committed by GitHub
parent 081113a62c 3f4a46bca6
commit 638522600a
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/UnityAsyncExtensions.uGUI.cs
View File

@@ -364,6 +364,7 @@ namespace Cysharp.Threading.Tasks
public AsyncUnityEventHandler(UnityEvent unityEvent, CancellationToken cancellationToken, bool callOnce) public AsyncUnityEventHandler(UnityEvent unityEvent, CancellationToken cancellationToken, bool callOnce)
{ {
this.cancellationToken = cancellationToken;
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
isDisposed = true; isDisposed = true;
@@ -372,7 +373,6 @@ namespace Cysharp.Threading.Tasks
this.action = Invoke; this.action = Invoke;
this.unityEvent = unityEvent; this.unityEvent = unityEvent;
this.cancellationToken = cancellationToken;
this.callOnce = callOnce; this.callOnce = callOnce;
unityEvent.AddListener(action); unityEvent.AddListener(action);
@@ -388,6 +388,10 @@ namespace Cysharp.Threading.Tasks
public UniTask OnInvokeAsync() public UniTask OnInvokeAsync()
{ {
core.Reset(); core.Reset();
if (isDisposed)
{
core.TrySetCanceled(this.cancellationToken);
}
return new UniTask(this, core.Version); return new UniTask(this, core.Version);
} }
@@ -470,6 +474,7 @@ namespace Cysharp.Threading.Tasks
public AsyncUnityEventHandler(UnityEvent<T> unityEvent, CancellationToken cancellationToken, bool callOnce) public AsyncUnityEventHandler(UnityEvent<T> unityEvent, CancellationToken cancellationToken, bool callOnce)
{ {
this.cancellationToken = cancellationToken;
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
isDisposed = true; isDisposed = true;
@@ -478,7 +483,6 @@ namespace Cysharp.Threading.Tasks
this.action = Invoke; this.action = Invoke;
this.unityEvent = unityEvent; this.unityEvent = unityEvent;
this.cancellationToken = cancellationToken;
this.callOnce = callOnce; this.callOnce = callOnce;
unityEvent.AddListener(action); unityEvent.AddListener(action);
@@ -494,6 +498,10 @@ namespace Cysharp.Threading.Tasks
public UniTask<T> OnInvokeAsync() public UniTask<T> OnInvokeAsync()
{ {
core.Reset(); core.Reset();
if (isDisposed)
{
core.TrySetCanceled(this.cancellationToken);
}
return new UniTask<T>(this, core.Version); return new UniTask<T>(this, core.Version);
} }