diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-05-10 12:07:21 -0500 |
|---|---|---|
| committer | David Snopek <dsnopek@gmail.com> | 2024-05-10 13:17:36 -0500 |
| commit | 14506a4282b6b9079280ec54f50f46ba041c0d10 (patch) | |
| tree | 566585e6fc1bd30b155414cc87b7d476b295c691 /core/object | |
| parent | 2ba22d1554ded08094e3869a83bd87487266ad38 (diff) | |
| download | redot-engine-14506a4282b6b9079280ec54f50f46ba041c0d10.tar.gz | |
GDExtension: Prevent crash during shutdown as singletons are deleted
Diffstat (limited to 'core/object')
| -rw-r--r-- | core/object/object.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index dfc8e2a29a..5125ab8a6e 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -2095,9 +2095,13 @@ Object::~Object() { _extension_instance = nullptr; } #ifdef TOOLS_ENABLED - else if (_instance_bindings != nullptr && Engine::get_singleton()->is_extension_reloading_enabled()) { - for (uint32_t i = 0; i < _instance_binding_count; i++) { - GDExtensionManager::get_singleton()->untrack_instance_binding(_instance_bindings[i].token, this); + else if (_instance_bindings != nullptr) { + Engine *engine = Engine::get_singleton(); + GDExtensionManager *gdextension_manager = GDExtensionManager::get_singleton(); + if (engine && gdextension_manager && engine->is_extension_reloading_enabled()) { + for (uint32_t i = 0; i < _instance_binding_count; i++) { + gdextension_manager->untrack_instance_binding(_instance_bindings[i].token, this); + } } } #endif |