summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-03-09 22:59:24 +0100
committerGitHub <noreply@github.com>2019-03-09 22:59:24 +0100
commit03664e26c5d372b0b4717308efc3144a2a089d4b (patch)
tree516f0651b9fe6124815fb85105917aa6381ebb41
parent8598641b15e5a18c07acff5bb496e74956bb1c74 (diff)
parent65b11d75175375705b285cbae8d3e313f475b3c7 (diff)
Merge pull request #26687 from QbieShay/hang_server_build_fix
Removed the resource preview thread from the server build
-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 9345ea6b6f..173333dac9 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -188,6 +188,7 @@ void EditorResourcePreview::_generate_preview(Ref<ImageTexture> &r_texture, Ref<
void EditorResourcePreview::_thread() {
+#ifndef SERVER_ENABLED
while (!exit) {
preview_sem->wait();
@@ -313,7 +314,7 @@ void EditorResourcePreview::_thread() {
preview_mutex->unlock();
}
}
-
+#endif
exited = true;
}