diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 11 | ||||
| -rw-r--r-- | core/os/input.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 743ae19a93..438db5d518 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -1883,6 +1883,14 @@ void _Thread::_start_func(void *ud) { Variant::CallError ce; const Variant* arg[1]={&t->userdata}; + // we don't know our thread pointer yet :( + if (t->name == "") { + // come up with a better name using maybe the filename on the Script? + //t->thread->set_name(t->target_method); + } else { + //t->thread->set_name(t->name); + }; + t->ret=t->target_instance->call(t->target_method,arg,1,ce); if (ce.error!=Variant::CallError::CALL_OK) { @@ -1941,9 +1949,6 @@ Error _Thread::start(Object *p_instance,const StringName& p_method,const Variant return ERR_CANT_CREATE; } - if (name != "") - thread->set_name(name); - return OK; } diff --git a/core/os/input.h b/core/os/input.h index 8aa0e6b18a..d81ebf4ec3 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -62,7 +62,7 @@ public: virtual float get_joy_axis(int p_device,int p_axis)=0; virtual String get_joy_name(int p_idx)=0; - virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name)=0; + virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid)=0; virtual Point2 get_mouse_pos() const=0; |