7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-22 15:37:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix legacy custom settings not being loaded

Browse source
This commit is contained in:
HJfod 2024-09-15 11:15:09 +03:00
parent 2999fb242a
commit f0b6a7074a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
loader/src/loader/ModSettingsManager.cpp
View file

@ -92,7 +92,7 @@ public:
matjson::Object savedata; matjson::Object savedata;
bool restartRequired = false; bool restartRequired = false;
void loadSettingValueFromSave(std::string_view key) { void loadSettingValueFromSave(std::string const& key) {
if (this->savedata.contains(key) && this->settings.contains(key)) { if (this->savedata.contains(key) && this->settings.contains(key)) {
auto& sett = this->settings.at(key); auto& sett = this->settings.at(key);
if (!sett.v3) return; if (!sett.v3) return;
@ -107,7 +107,7 @@ public:
} }
} }
} }
void saveSettingValueToSave(std::string_view key) { void saveSettingValueToSave(std::string const& key) {
if (this->settings.contains(key)) { if (this->settings.contains(key)) {
auto& sett = this->settings.at(key); auto& sett = this->settings.at(key);
// Store the value in an intermediary so if `save` fails the existing // Store the value in an intermediary so if `save` fails the existing
@ -118,11 +118,11 @@ public:
this->savedata[key] = value; this->savedata[key] = value;
} }
else { else {
log::error("Unable to save setting '{}' for mod {}", key, m_impl->modID); log::error("Unable to save setting '{}' for mod {}", key, this->modID);
} }
} }
catch(matjson::JsonException const& e) { catch(matjson::JsonException const& e) {
log::error("Unable to save setting '{}' for mod {} (JSON exception): {}", key, m_impl->modID, e.what()); log::error("Unable to save setting '{}' for mod {} (JSON exception): {}", key, this->modID, e.what());
} }
} }
} }
@ -205,6 +205,7 @@ Result<> ModSettingsManager::registerLegacyCustomSetting(std::string_view key, s
if (auto custom = typeinfo_pointer_cast<LegacyCustomSettingV3>(sett.v3)) { if (auto custom = typeinfo_pointer_cast<LegacyCustomSettingV3>(sett.v3)) {
if (!custom->getValue()) { if (!custom->getValue()) {
custom->setValue(std::move(ptr)); custom->setValue(std::move(ptr));
m_impl->loadSettingValueFromSave(id);
} }
else { else {
return Err("Setting '{}' in mod {} has already been registed", id, m_impl->modID); return Err("Setting '{}' in mod {} has already been registed", id, m_impl->modID);