diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-22 14:52:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 14:52:54 +0100 |
| commit | 409de53e7253a0e900b09aedb983d998ccf30659 (patch) | |
| tree | dd536babb72fca1de1826bea932f7b302368eaf7 /core/object.h | |
| parent | 829d21f1c223a159f58cc3f30a98a63ce1f3a9d2 (diff) | |
| parent | 41f59ecfca6ddea1eb7b023aaea75e80e3c30c5c (diff) | |
Merge pull request #35423 from Faless/fix/object_emit_free
Make sure we know when deleting an emitting object
Diffstat (limited to 'core/object.h')
| -rw-r--r-- | core/object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/object.h b/core/object.h index ad1865da7b..865c155764 100644 --- a/core/object.h +++ b/core/object.h @@ -465,8 +465,7 @@ private: MethodInfo user; VMap<Target, Slot> slot_map; - int lock; - Signal() { lock = 0; } + Signal() {} }; HashMap<StringName, Signal> signal_map; @@ -481,6 +480,7 @@ private: bool _predelete(); void _postinitialize(); bool _can_translate; + bool _emitting; #ifdef TOOLS_ENABLED bool _edited; uint32_t _edited_version; |