summaryrefslogtreecommitdiffstats
path: root/servers/rendering/rendering_server_default.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2023-04-27 21:18:22 +0200
committerGitHub <noreply@github.com>2023-04-27 21:18:22 +0200
commit2ff3cf9bf91dc532b0f435079aaf2ae6eee8609f (patch)
tree7eba64423370776fa9dab607246b371217ae4f24 /servers/rendering/rendering_server_default.cpp
parent240ed28291ae87f06f7bcaa66e3d08530f210bf2 (diff)
parent4aaa2e6477c2536d55003f58a50b01a74b4af5e5 (diff)
downloadredot-engine-2ff3cf9bf91dc532b0f435079aaf2ae6eee8609f.tar.gz
Merge pull request #76511 from spanzeri/fix-thread-wait
Fix wait for thread not started
Diffstat (limited to 'servers/rendering/rendering_server_default.cpp')
-rw-r--r--servers/rendering/rendering_server_default.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp
index 6017eff55e..5f14245307 100644
--- a/servers/rendering/rendering_server_default.cpp
+++ b/servers/rendering/rendering_server_default.cpp
@@ -237,7 +237,9 @@ void RenderingServerDefault::init() {
void RenderingServerDefault::finish() {
if (create_thread) {
command_queue.push(this, &RenderingServerDefault::_thread_exit);
- thread.wait_to_finish();
+ if (thread.is_started()) {
+ thread.wait_to_finish();
+ }
} else {
_finish();
}