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

Merge pull request #66255 from and3rson/3.x

Browse source 
[3.x] GDNative: Fix `script_data` error when updating placeholder scripts for GDNative libraries
This commit is contained in:
Rémi Verschelde 2022-10-03 15:04:08 +02:00
commit 7f560a2833
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1757,6 +1757,15 @@ void NativeReloadNode::_notification(int p_what) {
} }
for (Map<String, Set<NativeScript *>>::Element *U = NSL->library_script_users.front(); U; U = U->next()) { for (Map<String, Set<NativeScript *>>::Element *U = NSL->library_script_users.front(); U; U = U->next()) {
// Multiple GDNative libraries may be reloaded. The library and script
// path should match to prevent failing `NSL->library_classes` lookup
// from `get_script_desc()` in `script->_update_placeholder` below.
// This check also prevents "!script_data is true" error from occuring
// when e. g. re-focusing editor window.
if (L->key() != U->key()) {
continue;
}
for (Set<NativeScript *>::Element *S = U->get().front(); S; S = S->next()) { for (Set<NativeScript *>::Element *S = U->get().front(); S; S = S->next()) {
NativeScript *script = S->get(); NativeScript *script = S->get();