diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-16 13:35:21 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-16 13:35:21 +0200 |
| commit | 46d9db565bc8c8d9d14a51570ea788443afd5d1c (patch) | |
| tree | 8be1ff1582b5db175b27be38f802f58f50c9ebf0 /editor/editor_resource_preview.cpp | |
| parent | 86b40fe637a8a48973480757d2812751de1a2fd1 (diff) | |
| parent | f31867d2b9e7b916e24683c024764bcc3d326a83 (diff) | |
| download | redot-engine-46d9db565bc8c8d9d14a51570ea788443afd5d1c.tar.gz | |
Merge pull request #96904 from RandomShaper/fix_previewer_deadlock
ResourceLoader: Fix deadlocks caused by the resource changed feature
Diffstat (limited to 'editor/editor_resource_preview.cpp')
| -rw-r--r-- | editor/editor_resource_preview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 956fdc5cfa..a50b2f3dcc 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -533,8 +533,10 @@ void EditorResourcePreview::stop() { } while (!exited.is_set()) { + // Sync pending work. OS::get_singleton()->delay_usec(10000); - RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on rendering server + RenderingServer::get_singleton()->sync(); + MessageQueue::get_singleton()->flush(); } thread.wait_to_finish(); |