diff options
| author | Adam Cigánek | 2018-05-14 12:22:20 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-06-01 18:07:32 +0200 |
| commit | b95cc40640738f0c26b80b5ec96b4301858916cf (patch) | |
| tree | 0f049327764b668aa3efffb9ecd32eb106a3db2b | |
| parent | 9294978596d0fe05d54f7a07aa9dda17b29b3faa (diff) | |
| download | godot-b95cc40640738f0c26b80b5ec96b4301858916cf.tar.gz godot-b95cc40640738f0c26b80b5ec96b4301858916cf.tar.zst godot-b95cc40640738f0c26b80b5ec96b4301858916cf.zip | |
Set current SynchronizationContext before the game loop starts
This fixes the problem that `SynchronizationContext.Current` would be null
during the call to `_EnterTree`, `_Ready` and the first call to `_Process` thus
the task continuations would be scheduled outside the main thread, which is unexpected and might lead to crashes.
With this change, task continuations are scheduled always on the main thread and so async/await can be used without any explicit synchronization, which is what is expected.
Fixes #18849
(cherry picked from commit f25240cfe6a4b7f030b2dfd5db1365b4de44301d)
| -rw-r--r-- | modules/mono/glue/cs_files/GodotTaskScheduler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/mono/glue/cs_files/GodotTaskScheduler.cs b/modules/mono/glue/cs_files/GodotTaskScheduler.cs index 6bf25a89d..3d23ec10f 100644 --- a/modules/mono/glue/cs_files/GodotTaskScheduler.cs +++ b/modules/mono/glue/cs_files/GodotTaskScheduler.cs @@ -14,6 +14,7 @@ namespace Godot public GodotTaskScheduler() { Context = new GodotSynchronizationContext(); + SynchronizationContext.SetSynchronizationContext(Context); } protected sealed override void QueueTask(Task task) @@ -57,7 +58,6 @@ namespace Godot public void Activate() { - SynchronizationContext.SetSynchronizationContext(Context); ExecuteQueuedTasks(); Context.ExecutePendingContinuations(); } |