Merge pull request #63512 from MmAaXx500/autoload-double-add-remove

Prevent autoloads from being added or removed twice
This commit is contained in:
Rémi Verschelde 2022-11-29 16:48:58 +01:00
commit e16acf26db
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -541,8 +541,6 @@ void EditorAutoloadSettings::update_autoload() {
info.node->queue_free();
info.node = nullptr;
}
ProjectSettings::get_singleton()->remove_autoload(info.name);
}
// Load new/changed autoloads
@ -567,12 +565,6 @@ void EditorAutoloadSettings::update_autoload() {
}
}
ProjectSettings::AutoloadInfo prop_info;
prop_info.name = info->name;
prop_info.path = info->path;
prop_info.is_singleton = info->is_singleton;
ProjectSettings::get_singleton()->add_autoload(prop_info);
if (!info->in_editor && !info->is_singleton) {
// No reason to keep this node
memdelete(info->node);