summaryrefslogtreecommitdiff
path: root/core/extension
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-02-22 09:07:28 +0100
committerGitHub <noreply@github.com>2022-02-22 09:07:28 +0100
commite6c11e4dfd536590d826386148b0b3a967aa6f9a (patch)
tree1a87c2d039557c7046e09c16827f32ed6dd51460 /core/extension
parent256069eaf00be2340259f896695014d92b1e22ed (diff)
parentfe95aa2c90ddd9116f545c77e00cb5eec99fe486 (diff)
Merge pull request #58331 from poiati/fix-extension-registration-order-2
Diffstat (limited to 'core/extension')
-rw-r--r--core/extension/native_extension.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/extension/native_extension.cpp b/core/extension/native_extension.cpp
index 1512852234..e1db99fe5d 100644
--- a/core/extension/native_extension.cpp
+++ b/core/extension/native_extension.cpp
@@ -295,9 +295,10 @@ NativeExtension::InitializationLevel NativeExtension::get_minimum_library_initia
ERR_FAIL_COND_V(library == nullptr, INITIALIZATION_LEVEL_CORE);
return InitializationLevel(initialization.minimum_initialization_level);
}
+
void NativeExtension::initialize_library(InitializationLevel p_level) {
ERR_FAIL_COND(library == nullptr);
- ERR_FAIL_COND(p_level <= int32_t(level_initialized));
+ ERR_FAIL_COND_MSG(p_level <= int32_t(level_initialized), vformat("Level '%d' must be higher than the current level '%d'", p_level, level_initialized));
level_initialized = int32_t(p_level);