asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #77974 from RandomShaper/fix_gdscr_th_start

Browse source 
Mark thread name setup safe for nodes
This commit is contained in:
Rémi Verschelde 2023-06-08 16:55:51 +02:00
commit b761c3a54d
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/core_bind.cpp
View file

@ -1187,7 +1187,11 @@ void Thread::_start_func(void *ud) {
ERR_FAIL_MSG(vformat("Could not call function '%s' on previously freed instance to start thread %s.", t->target_callable.get_method(), t->get_id())); ERR_FAIL_MSG(vformat("Could not call function '%s' on previously freed instance to start thread %s.", t->target_callable.get_method(), t->get_id()));
} }
// Finding out a suitable name for the thread can involve querying a node, if the target is one.
// We know this is safe (unless the user is causing life cycle race conditions, which would be a bug on their part).
set_current_thread_safe_for_nodes(true);
String func_name = t->target_callable.is_custom() ? t->target_callable.get_custom()->get_as_text() : String(t->target_callable.get_method()); String func_name = t->target_callable.is_custom() ? t->target_callable.get_custom()->get_as_text() : String(t->target_callable.get_method());
set_current_thread_safe_for_nodes(false);
::Thread::set_name(func_name); ::Thread::set_name(func_name);
// To avoid a circular reference between the thread and the script which can possibly contain a reference // To avoid a circular reference between the thread and the script which can possibly contain a reference