Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into develop

This commit is contained in:
Petr Mrázek 2014-04-06 00:41:19 +02:00
commit e58e2643ca

View File

@ -255,7 +255,7 @@ void IconList::installIcons(QStringList iconFiles)
QFileInfo fileinfo(file); QFileInfo fileinfo(file);
if (!fileinfo.isReadable() || !fileinfo.isFile()) if (!fileinfo.isReadable() || !fileinfo.isFile())
continue; continue;
QString target = PathCombine("icons", fileinfo.fileName()); QString target = PathCombine(m_dir.dirName(), fileinfo.fileName());
QString suffix = fileinfo.suffix(); QString suffix = fileinfo.suffix();
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico") if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")