diff options
author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-05-16 23:44:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 23:44:55 +0200 |
commit | 41f79a6f14843406ea3c7f464a899fdc290e4bb0 (patch) | |
tree | 71468da473294350557b22e7c6c5c6e980f055bc | |
parent | 1378ca1e0429ce19320cec3941df58d59d50f18d (diff) | |
parent | f25240cfe6a4b7f030b2dfd5db1365b4de44301d (diff) |
Merge pull request #18889 from madadam/async-await-fix
Set current SynchronizationContext before the game loop starts
-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 6bf25a89d2..3d23ec10f1 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(); } |