PHXH
/
UniTask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #509 from Cysharp/ku/fix-dotween-registration 

Fix a bug in Dotween after returning to the pool of `CancellationToken.Register`
master
hadashiA 2023-09-21 12:20:43 +09:00 committed by GitHub
parent 64f7eec4e9 3ed28e534a
commit a46a4cac01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs vendored
View File

@ -148,6 +148,7 @@ namespace Cysharp.Threading.Tasks
Tween tween; Tween tween;
TweenCancelBehaviour cancelBehaviour; TweenCancelBehaviour cancelBehaviour;
CancellationToken cancellationToken; CancellationToken cancellationToken;
CancellationTokenRegistration cancellationRegistration;
CallbackType callbackType; CallbackType callbackType;
bool canceled; bool canceled;
@ -207,7 +208,7 @@ namespace Cysharp.Threading.Tasks
default: default:
break; break;
} }
if (result.originalCompleteAction == result.onCompleteCallbackDelegate) if (result.originalCompleteAction == result.onCompleteCallbackDelegate)
{ {
result.originalCompleteAction = null; result.originalCompleteAction = null;
@ -215,7 +216,7 @@ namespace Cysharp.Threading.Tasks
if (cancellationToken.CanBeCanceled) if (cancellationToken.CanBeCanceled)
{ {
cancellationToken.RegisterWithoutCaptureExecutionContext(x => result.cancellationRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(x =>
{ {
var source = (TweenConfiguredSource)x; var source = (TweenConfiguredSource)x;
switch (source.cancelBehaviour) switch (source.cancelBehaviour)
@ -250,30 +251,7 @@ namespace Cysharp.Threading.Tasks
source.tween.Complete(true); source.tween.Complete(true);
break; break;
case TweenCancelBehaviour.CancelAwait: case TweenCancelBehaviour.CancelAwait:
// restore to original callback source.RestoreOriginalCallback();
switch (callbackType)
{
case CallbackType.Kill:
tween.onKill = source.originalCompleteAction;
break;
case CallbackType.Complete:
tween.onComplete = source.originalCompleteAction;
break;
case CallbackType.Pause:
tween.onPause = source.originalCompleteAction;
break;
case CallbackType.Play:
tween.onPlay = source.originalCompleteAction;
break;
case CallbackType.Rewind:
tween.onRewind = source.originalCompleteAction;
break;
case CallbackType.StepComplete:
tween.onStepComplete = source.originalCompleteAction;
break;
default:
break;
}
source.core.TrySetCanceled(source.cancellationToken); source.core.TrySetCanceled(source.cancellationToken);
break; break;
} }
@ -376,7 +354,18 @@ namespace Cysharp.Threading.Tasks
{ {
TaskTracker.RemoveTracking(this); TaskTracker.RemoveTracking(this);
core.Reset(); core.Reset();
cancellationRegistration.Dispose();
RestoreOriginalCallback();
tween = default;
cancellationToken = default;
originalCompleteAction = default;
return pool.TryPush(this);
}
void RestoreOriginalCallback()
{
switch (callbackType) switch (callbackType)
{ {
case CallbackType.Kill: case CallbackType.Kill:
@ -400,11 +389,6 @@ namespace Cysharp.Threading.Tasks
default: default:
break; break;
} }
tween = default;
cancellationToken = default;
originalCompleteAction = default;
return pool.TryPush(this);
} }
} }
} }