diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-18 09:07:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-18 09:07:21 +0100 |
| commit | b4dc2e91e6143de6722aede77692fdacbfbe840c (patch) | |
| tree | 44f63cf142ae4f8661c60ac121ac0f4bc9ae85ae /core | |
| parent | 488116e4d8f12b78b44e4e9d83228e1598102d8a (diff) | |
| parent | 94ef200bab8feb5024b2c64ac14daa24e0c4cc55 (diff) | |
Merge pull request #58196 from poiati/fix-extension-registration-order
Diffstat (limited to 'core')
| -rw-r--r-- | core/register_core_types.cpp | 4 | ||||
| -rw-r--r-- | core/register_core_types.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index a4b6a589f3..7ebffdb459 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -316,9 +316,11 @@ void register_core_extensions() { native_extension_manager->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); } -void unregister_core_types() { +void unregister_core_extensions() { native_extension_manager->deinitialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); +} +void unregister_core_types() { memdelete(native_extension_manager); memdelete(resource_uid); diff --git a/core/register_core_types.h b/core/register_core_types.h index 0fd4e73c40..dfb2d8ac80 100644 --- a/core/register_core_types.h +++ b/core/register_core_types.h @@ -36,5 +36,6 @@ void register_core_settings(); void register_core_extensions(); void register_core_singletons(); void unregister_core_types(); +void unregister_core_extensions(); #endif // REGISTER_CORE_TYPES_H |