asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #15836 from karroffel/gdnative-more-fixes-hopefully

Browse source 
[GDNative] fix #15723
This commit is contained in:
Rémi Verschelde 2018-01-18 14:25:26 +01:00 committed by GitHub
commit 0550c7d9a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
modules/gdnative/nativescript/nativescript.cpp
View file

@ -798,11 +798,33 @@ NativeScriptLanguage *NativeScriptLanguage::singleton;
void NativeScriptLanguage::_unload_stuff(bool p_reload) { void NativeScriptLanguage::_unload_stuff(bool p_reload) {
for (Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.front(); L; L = L->next()) { for (Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.front(); L; L = L->next()) {
if (p_reload && library_gdnatives[L->key()].is_valid() && !library_gdnatives[L->key()]->get_library()->is_reloadable()) { String lib_path = L->key();
continue; Map<StringName, NativeScriptDesc> classes = L->get();
if (p_reload) {
Map<String, Ref<GDNative> >::Element *E = library_gdnatives.find(lib_path);
Ref<GDNative> gdn;
if (E) {
gdn = E->get();
}
bool should_reload = false;
if (gdn.is_valid()) {
Ref<GDNativeLibrary> lib = gdn->get_library();
if (lib.is_valid()) {
should_reload = lib->is_reloadable();
}
}
if (!should_reload) {
continue;
}
} }
for (Map<StringName, NativeScriptDesc>::Element *C = L->get().front(); C; C = C->next()) { for (Map<StringName, NativeScriptDesc>::Element *C = classes.front(); C; C = C->next()) {
// free property stuff first // free property stuff first
for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = C->get().properties.front(); P; P = P.next()) { for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = C->get().properties.front(); P; P = P.next()) {
@ -1063,6 +1085,11 @@ void NativeScriptLanguage::unregister_script(NativeScript *script) {
void NativeScriptLanguage::call_libraries_cb(const StringName &name) { void NativeScriptLanguage::call_libraries_cb(const StringName &name) {
// library_gdnatives is modified only from the main thread, so it's safe not to use mutex here // library_gdnatives is modified only from the main thread, so it's safe not to use mutex here
for (Map<String, Ref<GDNative> >::Element *L = library_gdnatives.front(); L; L = L->next()) { for (Map<String, Ref<GDNative> >::Element *L = library_gdnatives.front(); L; L = L->next()) {
if (L->get().is_null()) {
continue;
}
if (L->get()->is_initialized()) { if (L->get()->is_initialized()) {
void *proc_ptr; void *proc_ptr;
@ -1125,6 +1152,10 @@ void NativeReloadNode::_notification(int p_what) {
Ref<GDNative> gdn = L->get(); Ref<GDNative> gdn = L->get();
if (gdn.is_null()) {
continue;
}
if (!gdn->get_library()->is_reloadable()) { if (!gdn->get_library()->is_reloadable()) {
continue; continue;
} }
@ -1149,6 +1180,10 @@ void NativeReloadNode::_notification(int p_what) {
Ref<GDNative> gdn = L->get(); Ref<GDNative> gdn = L->get();
if (gdn.is_null()) {
continue;
}
if (!gdn->get_library()->is_reloadable()) { if (!gdn->get_library()->is_reloadable()) {
continue; continue;
} }