diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-13 22:13:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 22:13:29 +0100 |
| commit | 34ad33d9e0b211b2de5855373f8626af4fc0ce11 (patch) | |
| tree | 0df0dcf260ce05166671d297e77077790c3eedcc | |
| parent | f06372cb7326dedfb1882a024a97bff29ac73e28 (diff) | |
| parent | d5122ab31cea2364d7914a796572d457eac025ed (diff) | |
Merge pull request #35099 from neikeq/sync-visual-server-after-script-server-finish
Sync pending VisualServer commands after ScriptServer finalization
| -rw-r--r-- | main/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index 2f92451844..0ff392978a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2169,6 +2169,9 @@ void Main::cleanup() { ScriptServer::finish_languages(); + // Sync pending commands that may have been queued from a different thread during ScriptServer finalization + VisualServer::get_singleton()->sync(); + #ifdef TOOLS_ENABLED EditorNode::unregister_editor_types(); #endif |