mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-01 03:39:42 +00:00
Merge branch 'fix-the-launcher-again' into 'master'
Don't attempt to continue an outer loop from an inner loop Closes #8034 See merge request OpenMW/openmw!4192
This commit is contained in:
commit
ca3f89045c
1 changed files with 2 additions and 6 deletions
|
@ -263,13 +263,9 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
|
|||
for (const QString& listName : getContentLists())
|
||||
{
|
||||
const auto& listDirs = getDataDirectoryList(listName);
|
||||
if (dirs.length() != listDirs.length())
|
||||
if (!std::ranges::equal(
|
||||
dirs, listDirs, [](const SettingValue& dir, const QString& listDir) { return dir.value == listDir; }))
|
||||
continue;
|
||||
for (int i = 0; i < dirs.length(); ++i)
|
||||
{
|
||||
if (dirs[i].value != listDirs[i])
|
||||
continue;
|
||||
}
|
||||
if (files == getContentListFiles(listName) && archives == getArchiveList(listName))
|
||||
{
|
||||
setCurrentContentListName(listName);
|
||||
|
|
Loading…
Reference in a new issue