summaryrefslogtreecommitdiffstats
path: root/api/logic/FolderInstanceProvider.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-10-26 18:12:33 +0200
committerPetr Mrázek <peterix@gmail.com>2016-10-26 18:21:25 +0200
commit1b4851a941cbafb7bf7a45feee7149cefa7e0acb (patch)
tree6626a47c9d2f2b4a37302b0e036ab1ffc5033f3f /api/logic/FolderInstanceProvider.cpp
parentd66fdcd4cc6913508d2987c14cd9fc4d6760b8a5 (diff)
downloadMultiMC-1b4851a941cbafb7bf7a45feee7149cefa7e0acb.tar
MultiMC-1b4851a941cbafb7bf7a45feee7149cefa7e0acb.tar.gz
MultiMC-1b4851a941cbafb7bf7a45feee7149cefa7e0acb.tar.lz
MultiMC-1b4851a941cbafb7bf7a45feee7149cefa7e0acb.tar.xz
MultiMC-1b4851a941cbafb7bf7a45feee7149cefa7e0acb.zip
NOISSUE use QtConcurrent to run FS operations in worker threads
Not all operations - only the ones that aren't in error handling. The API for QFuture is too nasty to do much more in a sensible way.
Diffstat (limited to 'api/logic/FolderInstanceProvider.cpp')
-rw-r--r--api/logic/FolderInstanceProvider.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/FolderInstanceProvider.cpp b/api/logic/FolderInstanceProvider.cpp
index a1f3f1f2..ea0d4ef0 100644
--- a/api/logic/FolderInstanceProvider.cpp
+++ b/api/logic/FolderInstanceProvider.cpp
@@ -113,7 +113,7 @@ InstancePtr FolderInstanceProvider::loadInstance(const InstanceId& id)
#include "InstanceImportTask.h"
Task * FolderInstanceProvider::zipImportTask(const QUrl sourceUrl, const QString& instName, const QString& instGroup, const QString& instIcon)
{
- return new InstanceImportTask(m_globalSettings, sourceUrl, this, instName, instGroup, instIcon);
+ return new InstanceImportTask(m_globalSettings, sourceUrl, this, instName, instIcon, instGroup);
}
#include "InstanceCreationTask.h"
@@ -346,7 +346,7 @@ bool FolderInstanceProvider::commitStagedInstance(const QString& keyPath, const
emit instancesChanged();
}
saveGroupList();
- return destroyStagingPath(keyPath);
+ return true;
}
bool FolderInstanceProvider::destroyStagingPath(const QString& keyPath)