krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Some fixes to the settings handlers

Browse source
This commit is contained in:
Pieter van der Kloet 2013-02-24 04:14:18 +01:00
parent 4737b20e4c
commit 919d1ee572
2 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/launcher/settings/gamesettings.cpp
View file

@ -88,6 +88,8 @@ bool GameSettings::readFile(QTextStream &stream)
QString key = keyRe.cap(1).simplified(); QString key = keyRe.cap(1).simplified();
QString value = keyRe.cap(2).simplified(); QString value = keyRe.cap(2).simplified();
// Don't remove existing data entries
if (key != QLatin1String("data"))
mSettings.remove(key); mSettings.remove(key);
QStringList values = cache.values(key); QStringList values = cache.values(key);
@ -103,19 +105,6 @@ bool GameSettings::readFile(QTextStream &stream)
return true; return true;
} }
// Replace values from previous settings
QMapIterator<QString, QString> i(cache);
while (i.hasNext()) {
i.next();
// Don't remove existing data entries
if (i.key() == QLatin1String("data"))
continue;
if (mSettings.contains(i.key()))
mSettings.remove(i.key());
}
// Merge the changed keys with those which didn't // Merge the changed keys with those which didn't
mSettings.unite(cache); mSettings.unite(cache);
validatePaths(); validatePaths();
@ -136,7 +125,7 @@ bool GameSettings::writeFile(QTextStream &stream)
continue; continue;
// Quote paths with spaces // Quote paths with spaces
if (i.key() == QLatin1String("data") || i.key() == QLatin1String("data")) { if (i.key() == QLatin1String("data")) {
if (i.value().contains(" ")) { if (i.value().contains(" ")) {
stream << i.key() << "=\"" << i.value() << "\"\n"; stream << i.key() << "=\"" << i.value() << "\"\n";
continue; continue;

8
apps/launcher/settings/settingsbase.hpp
View file

@ -85,14 +85,6 @@ public:
return true; return true;
} }
// Replace values from previous settings
QMapIterator<QString, QString> i(mCache);
while (i.hasNext()) {
i.next();
if (mSettings.contains(i.key()))
mSettings.remove(i.key());
}
// Merge the changed keys with those which didn't // Merge the changed keys with those which didn't
mSettings.unite(mCache); mSettings.unite(mCache);
return true; return true;