mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-30 22:11:23 +00:00
Code Issues Releases Wiki Activity

currentDir.value is already canonicalised

Browse source
This commit is contained in:
AnyOldName3 2024-03-20 14:34:23 +00:00
parent a06ab94a20
commit b15f7857c0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/launcher/datafilespage.cpp
View file

@ -293,10 +293,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
std::unordered_set<QString> visitedDirectories; std::unordered_set<QString> visitedDirectories;
for (const Config::SettingValue& currentDir : directories) for (const Config::SettingValue& currentDir : directories)
{ {
// normalize user supplied directories: resolve symlink, convert to native separator if (!visitedDirectories.insert(currentDir.value).second)
const QString canonicalDirPath = QDir(QDir::cleanPath(currentDir.value)).canonicalPath();
if (!visitedDirectories.insert(canonicalDirPath).second)
continue; continue;
// add new achives files presents in current directory // add new achives files presents in current directory
@ -305,7 +302,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
QStringList tooltip; QStringList tooltip;
// add content files presents in current directory // add content files presents in current directory
mSelector->addFiles(currentDir.value, mNewDataDirs.contains(canonicalDirPath)); mSelector->addFiles(currentDir.value, mNewDataDirs.contains(currentDir.value));
// add current directory to list // add current directory to list
ui.directoryListWidget->addItem(currentDir.originalRepresentation); ui.directoryListWidget->addItem(currentDir.originalRepresentation);
@ -317,7 +314,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
tooltip << tr("Resolved as %1").arg(currentDir.value); tooltip << tr("Resolved as %1").arg(currentDir.value);
// Display new content with custom formatting // Display new content with custom formatting
if (mNewDataDirs.contains(canonicalDirPath)) if (mNewDataDirs.contains(currentDir.value))
{ {
tooltip << tr("Will be added to the current profile"); tooltip << tr("Will be added to the current profile");
QFont font = item->font(); QFont font = item->font();