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

[GDNative] fix reloading of non-reloadable libraries

Browse source
This commit is contained in:
karroffel 2018-01-06 21:10:01 +01:00
parent 50b975548d
commit 66eed7b859
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -790,8 +790,13 @@ NativeScriptInstance::~NativeScriptInstance() {
NativeScriptLanguage *NativeScriptLanguage::singleton; NativeScriptLanguage *NativeScriptLanguage::singleton;
void NativeScriptLanguage::_unload_stuff() { 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()]->get_library()->is_reloadable()) {
continue;
}
for (Map<StringName, NativeScriptDesc>::Element *C = L->get().front(); C; C = C->next()) { for (Map<StringName, NativeScriptDesc>::Element *C = L->get().front(); C; C = C->next()) {
// free property stuff first // free property stuff first
@ -1108,7 +1113,7 @@ void NativeReloadNode::_notification(int p_what) {
#ifndef NO_THREADS #ifndef NO_THREADS
MutexLock lock(NSL->mutex); MutexLock lock(NSL->mutex);
#endif #endif
NSL->_unload_stuff(); NSL->_unload_stuff(true);
for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) { for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
Ref<GDNative> gdn = L->get(); Ref<GDNative> gdn = L->get();

2
modules/gdnative/nativescript/nativescript.h
View file

@ -205,7 +205,7 @@ class NativeScriptLanguage : public ScriptLanguage {
private: private:
static NativeScriptLanguage *singleton; static NativeScriptLanguage *singleton;
void _unload_stuff(); void _unload_stuff(bool p_reload = false);
#ifndef NO_THREADS #ifndef NO_THREADS
Mutex *mutex; Mutex *mutex;