mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26842 from karroffel/gdnative-singleton-crash

Browse Source 
[GDNative] fix crash at shutdown when using singleton libraries and NativeScript
This commit is contained in:
Rémi Verschelde 2019-03-09 18:20:12 +01:00 committed by GitHub
commit d41cd57595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gdnative/gdnative.cpp
View File

@ -414,6 +414,7 @@ bool GDNative::terminate() {
if (error || !library_terminate) {
OS::get_singleton()->close_dynamic_library(native_handle);
native_handle = NULL;
initialized = false;
return true;
}

27
modules/gdnative/nativescript/nativescript.cpp
View File

@ -1036,8 +1036,16 @@ NativeScriptLanguage::~NativeScriptLanguage() {
for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
if (L->get().is_valid())
L->get()->terminate();
Ref<GDNative> lib = L->get();
// only shut down valid libs, duh!
if (lib.is_valid()) {
// If it's a singleton-library then the gdnative module
// manages the destruction at engine shutdown, not NativeScript.
if (!lib->get_library()->is_singleton()) {
lib->terminate();
}
}
}
NSL->library_classes.clear();
@ -1641,10 +1649,19 @@ void NativeReloadNode::_notification(int p_what) {
continue;
}
// Don't unload what should not be reloaded!
if (!gdn->get_library()->is_reloadable()) {
continue;
}
// singleton libraries might have alive pointers living inside the
// editor. Also reloading a singleton library would mean that
// the singleton entry will not be called again, as this only
// happens at engine startup.
if (gdn->get_library()->is_singleton()) {
continue;
}
gdn->terminate();
}
@ -1672,6 +1689,12 @@ void NativeReloadNode::_notification(int p_what) {
continue;
}
// since singleton libraries are not unloaded there is no point
// in loading them again.
if (!gdn->get_library()->is_singleton()) {
continue;
}
if (!gdn->initialize()) {
libs_to_remove.insert(L->key());
continue;