diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-12 08:49:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 08:49:19 +0200 |
| commit | d4235f51b1a88e48d676b877422fb121d326935c (patch) | |
| tree | a88dc17a4dbe4e65c32959f5f9453429448a9d19 | |
| parent | 91dd049aab073cc063c172d338fc1817db156c24 (diff) | |
| parent | 228ce1d2b651e0e5b76521c4a0c055d997bb0c0d (diff) | |
Merge pull request #61949 from touilleMan/native_extension_open_library_handle_initialization_error
Fix NativeExtension::open_library return value when the undelying lib fails to initialize
| -rw-r--r-- | core/extension/native_extension.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/extension/native_extension.cpp b/core/extension/native_extension.cpp index 5738b42049..ac9d2ca8a6 100644 --- a/core/extension/native_extension.cpp +++ b/core/extension/native_extension.cpp @@ -295,9 +295,12 @@ Error NativeExtension::open_library(const String &p_path, const String &p_entry_ GDNativeInitializationFunction initialization_function = (GDNativeInitializationFunction)entry_funcptr; - initialization_function(&gdnative_interface, this, &initialization); - level_initialized = -1; - return OK; + if (initialization_function(&gdnative_interface, this, &initialization)) { + level_initialized = -1; + return OK; + } else { + return FAILED; + } } void NativeExtension::close_library() { |