mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-08 09:37:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'cifileprofiles' into 'master'

Browse Source 
Compare content files and archives case insensitively when matching existing profiles

See merge request OpenMW/openmw!4419
This commit is contained in:
Alexei Kotov 2024-10-24 03:23:10 +00:00
commit e9627e9b0c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/config/launchersettings.cpp
View File

@ -266,11 +266,14 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
if (!std::ranges::equal(
dirs, listDirs, [](const SettingValue& dir, const QString& listDir) { return dir.value == listDir; }))
continue;
if (files == getContentListFiles(listName) && archives == getArchiveList(listName))
{
setCurrentContentListName(listName);
return;
}
constexpr auto compareFiles
= [](const QString& a, const QString& b) { return a.compare(b, Qt::CaseInsensitive) == 0; };
if (!std::ranges::equal(files, getContentListFiles(listName), compareFiles))
continue;
if (!std::ranges::equal(archives, getArchiveList(listName), compareFiles))
continue;
setCurrentContentListName(listName);
return;
}
// otherwise, add content list