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

Fix UniTask.WaitUntilValueChanged does not handle UnityEngine.Object is destroyed correctly

master
neuecc 2020-05-21 02:24:12 +09:00
parent 42dcfdbcdc
commit 962c215e3b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.WaitUntil.cs
View File

@ -28,7 +28,7 @@ namespace Cysharp.Threading.Tasks
where T : class where T : class
{ {
var unityObject = target as UnityEngine.Object; var unityObject = target as UnityEngine.Object;
var isUnityObject = !object.ReferenceEquals(target, null); // don't use (unityObject == null) var isUnityObject = target is UnityEngine.Object; // don't use (unityObject == null)
return new UniTask<U>(isUnityObject return new UniTask<U>(isUnityObject
? WaitUntilValueChangedUnityObjectPromise<T, U>.Create(target, monitorFunction, equalityComparer, monitorTiming, cancellationToken, out var token) ? WaitUntilValueChangedUnityObjectPromise<T, U>.Create(target, monitorFunction, equalityComparer, monitorTiming, cancellationToken, out var token)
@ -330,6 +330,7 @@ namespace Cysharp.Threading.Tasks
static readonly PromisePool<WaitUntilValueChangedUnityObjectPromise<T, U>> pool = new PromisePool<WaitUntilValueChangedUnityObjectPromise<T, U>>(); static readonly PromisePool<WaitUntilValueChangedUnityObjectPromise<T, U>> pool = new PromisePool<WaitUntilValueChangedUnityObjectPromise<T, U>>();
T target; T target;
UnityEngine.Object targetAsUnityObject;
U currentValue; U currentValue;
Func<T, U> monitorFunction; Func<T, U> monitorFunction;
IEqualityComparer<U> equalityComparer; IEqualityComparer<U> equalityComparer;
@ -351,6 +352,7 @@ namespace Cysharp.Threading.Tasks
var result = pool.TryRent() ?? new WaitUntilValueChangedUnityObjectPromise<T, U>(); var result = pool.TryRent() ?? new WaitUntilValueChangedUnityObjectPromise<T, U>();
result.target = target; result.target = target;
result.targetAsUnityObject = target as UnityEngine.Object;
result.monitorFunction = monitorFunction; result.monitorFunction = monitorFunction;
result.currentValue = monitorFunction(target); result.currentValue = monitorFunction(target);
result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>(); result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>();
@ -399,7 +401,7 @@ namespace Cysharp.Threading.Tasks
public bool MoveNext() public bool MoveNext()
{ {
if (cancellationToken.IsCancellationRequested || target == null) // destroyed = cancel. if (cancellationToken.IsCancellationRequested || targetAsUnityObject == null) // destroyed = cancel.
{ {
core.TrySetCanceled(cancellationToken); core.TrySetCanceled(cancellationToken);
return false; return false;