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

Merge pull request #41568 from dalexeev/config_file_empty_sect

Browse source 
Fix saving section-less keys in `ConfigFile`
This commit is contained in:
Rémi Verschelde 2022-06-07 20:53:38 +02:00 committed by GitHub
commit e136f4741c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/io/config_file.cpp
View file

@ -61,19 +61,19 @@ PackedStringArray ConfigFile::_get_section_keys(const String &p_section) const {
} }
void ConfigFile::set_value(const String &p_section, const String &p_key, const Variant &p_value) { void ConfigFile::set_value(const String &p_section, const String &p_key, const Variant &p_value) {
if (p_value.get_type() == Variant::NIL) { if (p_value.get_type() == Variant::NIL) { // Erase key.
//erase
if (!values.has(p_section)) { if (!values.has(p_section)) {
return; // ? return;
} }
values[p_section].erase(p_key); values[p_section].erase(p_key);
if (values[p_section].is_empty()) { if (values[p_section].is_empty()) {
values.erase(p_section); values.erase(p_section);
} }
} else { } else {
if (!values.has(p_section)) { if (!values.has(p_section)) {
values[p_section] = HashMap<String, Variant>(); // Insert section-less keys at the beginning.
values.insert(p_section, HashMap<String, Variant>(), p_section.is_empty());
} }
values[p_section][p_key] = p_value; values[p_section][p_key] = p_value;
@ -125,6 +125,9 @@ void ConfigFile::erase_section_key(const String &p_section, const String &p_key)
ERR_FAIL_COND_MSG(!values[p_section].has(p_key), vformat("Cannot erase nonexistent key \"%s\" from section \"%s\".", p_key, p_section)); ERR_FAIL_COND_MSG(!values[p_section].has(p_key), vformat("Cannot erase nonexistent key \"%s\" from section \"%s\".", p_key, p_section));
values[p_section].erase(p_key); values[p_section].erase(p_key);
if (values[p_section].is_empty()) {
values.erase(p_section);
}
} }
Error ConfigFile::save(const String &p_path) { Error ConfigFile::save(const String &p_path) {