Merge branch 'content-lists-could-provide-duplicate-fallback-archives' into 'master'

Gracefully handle content lists that specify duplicate BSAs

Closes #8200

See merge request OpenMW/openmw!4421
pull/3236/head
psi29a 2 months ago
commit a11e683a40

@ -399,6 +399,9 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
continue; continue;
const auto name = match[0]->text(); const auto name = match[0]->text();
const auto oldrow = ui.archiveListWidget->row(match[0]); const auto oldrow = ui.archiveListWidget->row(match[0]);
// entries may be duplicated, e.g. if a content list predated a BSA being added to a non-user config file
if (oldrow < row)
continue;
ui.archiveListWidget->takeItem(oldrow); ui.archiveListWidget->takeItem(oldrow);
ui.archiveListWidget->insertItem(row, name); ui.archiveListWidget->insertItem(row, name);
ui.archiveListWidget->item(row)->setCheckState(Qt::Checked); ui.archiveListWidget->item(row)->setCheckState(Qt::Checked);

Loading…
Cancel
Save