diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-28 11:10:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 11:10:09 +0200 |
| commit | ed5267f69fd580b6c422153cfa46d0f33374d0db (patch) | |
| tree | affa49e92293a62edaaa083fc51caece48c6dfc6 /core/core_bind.h | |
| parent | c89c2878efee067a469cb7ff7c3514d8115b7a56 (diff) | |
| parent | 97c68514c4d88cf94272332f1e390cc2e0bcd394 (diff) | |
Merge pull request #53053 from LATRio/callable_in_thread_start
Diffstat (limited to 'core/core_bind.h')
| -rw-r--r-- | core/core_bind.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/core_bind.h b/core/core_bind.h index a5d5a7c8ce..84a284f948 100644 --- a/core/core_bind.h +++ b/core/core_bind.h @@ -539,8 +539,7 @@ protected: Variant ret; Variant userdata; SafeFlag active; - Object *target_instance = nullptr; - StringName target_method; + Callable target_callable; ::Thread thread; static void _bind_methods(); static void _start_func(void *ud); @@ -553,7 +552,7 @@ public: PRIORITY_MAX }; - Error start(Object *p_instance, const StringName &p_method, const Variant &p_userdata = Variant(), Priority p_priority = PRIORITY_NORMAL); + Error start(const Callable &p_callable, const Variant &p_userdata = Variant(), Priority p_priority = PRIORITY_NORMAL); String get_id() const; bool is_active() const; Variant wait_to_finish(); |