summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-01 12:03:46 +0200
committerGitHub <noreply@github.com>2019-07-01 12:03:46 +0200
commitb62041d1f3b6428974d5be7ad9d378a445d432ac (patch)
tree2b90859ae66d56ba6e28650e0bf9649ca997f305
parente285114e0ce6534add2d74232ee61f6a4b2f1f81 (diff)
parentd1dbbd6515b7710594a406010177aa23e6b766b0 (diff)
Merge pull request #30089 from fire/cicd-crash
Headless CI/CD crash fixes
-rw-r--r--editor/editor_resource_preview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 6cca0a0ffa..f2e4d1086b 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -218,6 +218,7 @@ void EditorResourcePreview::_generate_preview(Ref<ImageTexture> &r_texture, Ref<
void EditorResourcePreview::_thread() {
#ifndef SERVER_ENABLED
+ exited = false;
while (!exit) {
preview_sem->wait();
@@ -452,8 +453,8 @@ void EditorResourcePreview::check_for_invalidation(const String &p_path) {
void EditorResourcePreview::start() {
ERR_FAIL_COND(thread);
thread = Thread::create(_thread_func, this);
- exited = false;
}
+
void EditorResourcePreview::stop() {
if (thread) {
exit = true;