diff options
| author | timoreo22 <timo.oreo34@gmail.com> | 2022-05-28 15:45:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 15:45:26 +0200 |
| commit | 4af8a9ed2d20a8ecc8d272813d12f098d8552cbf (patch) | |
| tree | af4e7b656a9b89cef93b2726b1e661bf0795f679 /launcher | |
| parent | 83078cd49a8fbe67c535397a990a33c84b845b5c (diff) | |
| parent | 5d3bef32caad17e374559e4718ce73ae2fadbc34 (diff) | |
| download | PrismLauncher-4af8a9ed2d20a8ecc8d272813d12f098d8552cbf.tar.gz PrismLauncher-4af8a9ed2d20a8ecc8d272813d12f098d8552cbf.tar.bz2 PrismLauncher-4af8a9ed2d20a8ecc8d272813d12f098d8552cbf.zip | |
Merge pull request #650 from flowln/modrinth_icons
Fix modpack icon importing with non-standard icon paths
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/icons/IconList.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp index c269d10a..0ddfae55 100644 --- a/launcher/icons/IconList.cpp +++ b/launcher/icons/IconList.cpp @@ -273,7 +273,7 @@ void IconList::installIcons(const QStringList &iconFiles) QFileInfo fileinfo(file); if (!fileinfo.isReadable() || !fileinfo.isFile()) continue; - QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName()); + QString target = FS::PathCombine(getDirectory(), fileinfo.fileName()); QString suffix = fileinfo.suffix(); if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif") @@ -290,7 +290,7 @@ void IconList::installIcon(const QString &file, const QString &name) if(!fileinfo.isReadable() || !fileinfo.isFile()) return; - QString target = FS::PathCombine(m_dir.dirName(), name); + QString target = FS::PathCombine(getDirectory(), name); QFile::copy(file, target); } |