Alex/Capy64
1
0
Fork 0
mirror of https://github.com/Ale32bit/Capy64.git synced 2025-01-18 10:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes and Task:await() returns result/error if already ended

Browse source
This commit is contained in:
Alessandro Proto 2023-03-07 22:16:41 +01:00
parent 9aadc35329
commit 16223c9986
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Capy64/Runtime/Objects/Task.cs
View file

@ -54,7 +54,6 @@ public class TaskMeta : IComponent
public Guid Guid { get; set; } = Guid.NewGuid();
public string Name { get; set; } = "object";
public TaskStatus Status { get; set; } = TaskStatus.Running;
public object Result { get; private set; }
public string Error { get; private set; }
public int DataIndex { get; private set; } = 0;
@ -233,9 +232,28 @@ public class TaskMeta : IComponent
{
var L = Lua.FromIntPtr(state);
WaitForTask(L);
var task = CheckTask(L, false);
return 0;
if (task.Status == TaskStatus.Succeeded)
{
// Push copy of value on top and move it to L
tasks.PushCopy(task.DataIndex);
tasks.XMove(L, 1);
L.PushNil();
}
else if (task.Status == TaskStatus.Failed)
{
L.PushNil();
L.PushString(task.Error);
}
else if (task.Status == TaskStatus.Running)
{
WaitForTask(L);
return 0;
}
return 2;
}
private static int LK_Await(IntPtr state, int status, nint ctx)