mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 12:09:43 +00:00
Code Issues Releases Wiki Activity

Don't unnecessarily overwrite openmw.cfg

Browse source 
We don't need to risk reformatting the user's potentially-handwritten file if it parses to the same thing as we're about to write.
This commit is contained in:
AnyOldName3 2025-01-10 00:46:58 +00:00
parent ec43849020
commit 806635b96c
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
components/config/gamesettings.cpp
View file

@ -301,6 +301,25 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
if (fileCopy.empty())
return writeFile(stream);
QMultiMap<QString, SettingValue> existingSettings;
QString context = QFileInfo(file).absoluteDir().path();
if (readFile(stream, existingSettings, context))
{
// don't use QMultiMap operator== as mUserSettings may have blank context fields
// don't use one std::equal with custom predicate as (until Qt 6.4) there was no key-value iterator
if (std::equal(existingSettings.keyBegin(), existingSettings.keyEnd(), mUserSettings.keyBegin(),
mUserSettings.keyEnd())
&& std::equal(existingSettings.cbegin(), existingSettings.cend(), mUserSettings.cbegin(),
[](const SettingValue& l, const SettingValue& r) {
return l.originalRepresentation == r.originalRepresentation;
}))
{
// The existing file already contains what we need, don't risk scrambling comments and formatting
return true;
}
}
stream.seek(0);
// start
// |
// | +----------------------------------------------------------+