Skip to content

fix: support Unity 6000 TreeView and guard async progress reentrancy #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SUWAROW wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: support Unity 6000 TreeView and guard async progress reentrancy #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/UniTask/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
using Cysharp.Threading.Tasks.Internal;
using System.Text;
using System.Text.RegularExpressions;
#if UNITY_6000_2_OR_NEWER
using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif

namespace Cysharp.Threading.Tasks.Editor
{
Expand Down
6 changes: 5 additions & 1 deletion ...niTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AssetBundleRequestAllAssets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -251,4 +255,4 @@ void Continuation(AsyncOperation _)
}

#endif
#endif
#endif
10 changes: 9 additions & 1 deletion src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AsyncInstantiate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -339,6 +343,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -383,4 +391,4 @@ void Continuation(AsyncOperation _)
}
}

#endif
#endif
22 changes: 21 additions & 1 deletion src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -432,6 +436,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -667,6 +675,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -903,6 +915,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -1156,6 +1172,10 @@ public bool MoveNext()
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -1213,4 +1233,4 @@ void Continuation(AsyncOperation _)
#endif

}
}
}
6 changes: 5 additions & 1 deletion src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@ namespace Cysharp.Threading.Tasks
if (progress != null)
{
progress.Report(asyncOperation.progress);
if (completed || asyncOperation == null)
{
return false;
}
}

if (asyncOperation.isDone)
Expand Down Expand Up @@ -349,4 +353,4 @@ namespace Cysharp.Threading.Tasks

<# } #>
}
}
}