dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-04-13 21:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

probably fix preserve old keys

Browse Source
This commit is contained in:
georgemoralis 2026-03-05 14:30:59 +02:00
parent cecd98aa28
commit 75229eebe5
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/emulator_settings.cpp
View File

@ -242,6 +242,8 @@ bool EmulatorSettingsImpl::Save(const std::string& serial) {
Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "config.json";
SetConfigVersion(Common::g_scm_rev);
// Build the JSON for the fields this build knows about
json j;
j["General"] = m_general;
j["Debug"] = m_debug;
@ -249,12 +251,33 @@ bool EmulatorSettingsImpl::Save(const std::string& serial) {
j["Audio"] = m_audio;
j["GPU"] = m_gpu;
j["Vulkan"] = m_vulkan;
// Read the existing file so we can preserve keys unknown to this build (e.g. baz from a
// newer build)
json existing = json::object();
if (std::ifstream existingIn{path}; existingIn.good()) {
try {
existingIn >> existing;
} catch (...) {
existing = json::object();
}
}
// Merge: update each section's known keys, but leave unknown keys intact
for (auto& [section, val] : j.items()) {
if (existing.contains(section) && existing[section].is_object() && val.is_object())
existing[section].update(
val); // overwrites known keys, keeps unknown ones (like baz)
else
existing[section] = val;
}
std::ofstream out(path);
if (!out) {
if (!out) {
LOG_ERROR(EmuSettings, "Failed to open config for writing: {}", path.string());
return false;
}
out << std::setw(4) << j;
out << std::setw(4) << existing;
return !out.fail();
}
} catch (const std::exception& e) {