diff --git a/modules/nativescript/nativescript.cpp b/modules/nativescript/nativescript.cpp index 493f21d75e8..541fe951e4e 100644 --- a/modules/nativescript/nativescript.cpp +++ b/modules/nativescript/nativescript.cpp @@ -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 >::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 libs_to_remove; @@ -1010,6 +1014,8 @@ void NativeReloadNode::_notification(int p_what) { } } + unloaded = false; + for (Set::Element *R = libs_to_remove.front(); R; R = R->next()) { NSL->library_gdnatives.erase(R->get()); } diff --git a/modules/nativescript/nativescript.h b/modules/nativescript/nativescript.h index 5702ba2e8d2..bc7a6e3ed65 100644 --- a/modules/nativescript/nativescript.h +++ b/modules/nativescript/nativescript.h @@ -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);