diff options
| author | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-11-21 23:19:50 +0800 |
|---|---|---|
| committer | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-11-21 23:19:50 +0800 |
| commit | f916ce875266ea2070c10f80ded35b66d315418c (patch) | |
| tree | 5aa0caaac52847222a23482ff5fba7b41fca0f26 /launcher/InstanceCopyTask.cpp | |
| parent | 7096f02b88e982df6c770113146a07874a1e9d0f (diff) | |
| parent | 5cc91965d09070437af8c17113c5740401b127dd (diff) | |
| download | PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.gz PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.bz2 PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu
Diffstat (limited to 'launcher/InstanceCopyTask.cpp')
| -rw-r--r-- | launcher/InstanceCopyTask.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp index a4ea947d..0a83ed9c 100644 --- a/launcher/InstanceCopyTask.cpp +++ b/launcher/InstanceCopyTask.cpp @@ -26,9 +26,11 @@ void InstanceCopyTask::executeTask() setStatus(tr("Copying instance %1").arg(m_origInstance->name())); FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath); - folderCopy.followSymlinks(false).blacklist(m_matcher.get()); + folderCopy.followSymlinks(false).matcher(m_matcher.get()); - m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy); + m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), [&folderCopy]{ + return folderCopy(); + }); connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished); connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted); m_copyFutureWatcher.setFuture(m_copyFuture); |