mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-16 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Hopefully convince the old MSVC version on GitLab CI to work

Browse Source 
The old code was legal, and the things it did worked in other places, so should have worked here, too.

Hopefully just rearranging stuff convinces what I assume to be a compiler bug to not happen.
This commit is contained in:
AnyOldName3 2024-03-06 23:52:16 +00:00
parent ed23f48754
commit 243b5b6666
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/config/gamesettings.cpp
View File

@ -544,19 +544,15 @@ bool Config::GameSettings::hasMaster()
void Config::GameSettings::setContentList( void Config::GameSettings::setContentList(
const QList<SettingValue>& dirNames, const QList<SettingValue>& archiveNames, const QStringList& fileNames) const QList<SettingValue>& dirNames, const QList<SettingValue>& archiveNames, const QStringList& fileNames)
{ {
auto const reset = [this](const char* key, const QStringList& list) {
remove(key);
for (auto const& item : list)
setMultiValue(key, { item });
};
remove(sDirectoryKey); remove(sDirectoryKey);
for (auto const& item : dirNames) for (auto const& item : dirNames)
setMultiValue(sDirectoryKey, item); setMultiValue(sDirectoryKey, item);
remove(sArchiveKey); remove(sArchiveKey);
for (auto const& item : archiveNames) for (auto const& item : archiveNames)
setMultiValue(sArchiveKey, item); setMultiValue(sArchiveKey, item);
reset(sContentKey, fileNames); remove(sContentKey);
for (auto const& item : fileNames)
setMultiValue(sContentKey, { item });
} }
QList<Config::SettingValue> Config::GameSettings::getDataDirs() const QList<Config::SettingValue> Config::GameSettings::getDataDirs() const