Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Prevent thread wait on itself for finish 

(cherry picked from commit afc5af8dfa)
3.3
Pedro J. Estébanez 2021-02-25 13:16:27 +07:00 committed by Rémi Verschelde
parent f0fc338858
commit ef129acedd
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/os/thread.cpp
Unescape Escape View File

@ -92,6 +92,7 @@ bool Thread::is_started() const {
void Thread::wait_to_finish() {
if (id != 0) {
ERR_FAIL_COND_MSG(id == get_caller_id(), "A Thread can't wait for itself to finish.");
thread.join();
std::thread empty_thread;
thread.swap(empty_thread);