Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-03 09:32:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #9844 from karroffel/nativescript-double-init-fix

Browse Source 
[NativeScript] fix double initialization in editor
This commit is contained in:
Thomas Herzog 2017-07-25 18:42:18 +02:00 committed by GitHub
commit 497411aa12
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/nativescript/nativescript.cpp
View File

@ -958,7 +958,8 @@ void NativeReloadNode::_notification(int p_what) {
switch (p_what) {
case MainLoop::NOTIFICATION_WM_FOCUS_OUT: {
print_line("unload");
if (unloaded)
break;
NSL->_unload_stuff();
for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
@ -967,11 +968,14 @@ void NativeReloadNode::_notification(int p_what) {
NSL->library_classes.erase(L->key());
}
unloaded = true;
} break;
case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
print_line("load");
if (!unloaded)
break;
Set<StringName> libs_to_remove;
@ -1010,6 +1014,8 @@ void NativeReloadNode::_notification(int p_what) {
}
}
unloaded = false;
for (Set<StringName>::Element *R = libs_to_remove.front(); R; R = R->next()) {
NSL->library_gdnatives.erase(R->get());
}

2
modules/nativescript/nativescript.h
View File

@ -259,6 +259,8 @@ inline NativeScriptDesc *NativeScript::get_script_desc() const {
class NativeReloadNode : public Node {
GDCLASS(NativeReloadNode, Node)
bool unloaded = false;
public:
static void _bind_methods();
void _notification(int p_what);