Merge branch 'cifileprofiles' into 'master'

Compare content files and archives case insensitively when matching existing profiles

See merge request OpenMW/openmw!4419
pull/3236/head
Alexei Kotov 2 months ago
commit e9627e9b0c

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

Loading…
Cancel
Save