summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-04-06 00:41:19 +0200
committerPetr Mrázek <peterix@gmail.com>2014-04-06 00:41:19 +0200
commite58e2643caa6179a0d055be893c24463db1c428f (patch)
tree4f3445d87b4984c2954802e18e4039a88d99544a
parent42e305bb9d1babef9bb66a8d376289e8aebed671 (diff)
parent8594cc8f6ce51782c314a431c793c40575a9d7b0 (diff)
downloadMultiMC-e58e2643caa6179a0d055be893c24463db1c428f.tar
MultiMC-e58e2643caa6179a0d055be893c24463db1c428f.tar.gz
MultiMC-e58e2643caa6179a0d055be893c24463db1c428f.tar.lz
MultiMC-e58e2643caa6179a0d055be893c24463db1c428f.tar.xz
MultiMC-e58e2643caa6179a0d055be893c24463db1c428f.zip
Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into develop
-rw-r--r--logic/icons/IconList.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp
index d76e6fbb..829fc5fc 100644
--- a/logic/icons/IconList.cpp
+++ b/logic/icons/IconList.cpp
@@ -255,7 +255,7 @@ void IconList::installIcons(QStringList iconFiles)
QFileInfo fileinfo(file);
if (!fileinfo.isReadable() || !fileinfo.isFile())
continue;
- QString target = PathCombine("icons", fileinfo.fileName());
+ QString target = PathCombine(m_dir.dirName(), fileinfo.fileName());
QString suffix = fileinfo.suffix();
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")