diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2020-11-14 16:14:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 16:14:50 +0100 |
| commit | 66c09999014fd4337baa6ae03f019cb77917d6df (patch) | |
| tree | f7939bfa85f06bb2e23392508648cd45b447b45c /api/logic/modplatform/technic/SingleZipPackInstallTask.cpp | |
| parent | eb3e6e4c6ae29c9542d6c4b715644b7207c1ee93 (diff) | |
| parent | edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39 (diff) | |
| download | MultiMC-66c09999014fd4337baa6ae03f019cb77917d6df.tar MultiMC-66c09999014fd4337baa6ae03f019cb77917d6df.tar.gz MultiMC-66c09999014fd4337baa6ae03f019cb77917d6df.tar.lz MultiMC-66c09999014fd4337baa6ae03f019cb77917d6df.tar.xz MultiMC-66c09999014fd4337baa6ae03f019cb77917d6df.zip | |
Merge pull request #3438 from jamierocks/technic-zip-fix
GH-3437 Extract Technic single zip packs to correct place
Diffstat (limited to 'api/logic/modplatform/technic/SingleZipPackInstallTask.cpp')
| -rw-r--r-- | api/logic/modplatform/technic/SingleZipPackInstallTask.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp index 833ac0a2..7901db04 100644 --- a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp +++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "SingleZipPackInstallTask.h" #include "Env.h" @@ -21,6 +20,7 @@ #include "TechnicPackProcessor.h" #include <QtConcurrent> +#include <FileSystem.h> Technic::SingleZipPackInstallTask::SingleZipPackInstallTask(const QUrl &sourceUrl, const QString &minecraftVersion) { @@ -48,7 +48,7 @@ void Technic::SingleZipPackInstallTask::executeTask() void Technic::SingleZipPackInstallTask::downloadSucceeded() { setStatus(tr("Extracting modpack")); - QDir extractDir(m_stagingPath); + QDir extractDir(FS::PathCombine(m_stagingPath, ".minecraft")); qDebug() << "Attempting to create instance from" << m_archivePath; // open the zip and find relevant files in it |