fixed substatus on ftb_import

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

2 files changed, 4 insertions, 29 deletions

diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 4b01e469..a4c78397 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -65,6 +65,7 @@ void PackInstallTask::executeTask()
 void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading zip for %1").arg(m_pack.name));
+    setProgress(1, 4);
     setAbortable(false);
 
     archivePath = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
@@ -78,11 +79,10 @@ void PackInstallTask::downloadPack()
     }
     netJobContainer->addNetAction(Net::Download::makeFile(url, archivePath));
 
-    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
-    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
-    connect(netJobContainer.get(), &NetJob::progress, this, &PackInstallTask::onDownloadProgress);
+    connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::unzip);
+    connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::emitFailed);
     connect(netJobContainer.get(), &NetJob::stepProgress, this, &PackInstallTask::propogateStepProgress);
-    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::onDownloadAborted);
+    connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::emitAborted);
 
     netJobContainer->start();
 
@@ -90,27 +90,6 @@ void PackInstallTask::downloadPack()
     progress(1, 4);
 }
 
-void PackInstallTask::onDownloadSucceeded()
-{
-    unzip();
-}
-
-void PackInstallTask::onDownloadFailed(QString reason)
-{
-    emitFailed(reason);
-}
-
-void PackInstallTask::onDownloadProgress(qint64 current, qint64 total)
-{
-    progress(current, total * 4);
-    setStatus(tr("Downloading zip for %1 (%2%)").arg(m_pack.name).arg(current / 10));
-}
-
-void PackInstallTask::onDownloadAborted()
-{
-    emitAborted();
-}
-
 void PackInstallTask::unzip()
 {
     setStatus(tr("Extracting modpack"));
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index 94bb2901..30ff4859 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -34,10 +34,6 @@ class PackInstallTask : public InstanceTask {
     void install();
 
    private slots:
-    void onDownloadSucceeded();
-    void onDownloadFailed(QString reason);
-    void onDownloadProgress(qint64 current, qint64 total);
-    void onDownloadAborted();
 
     void onUnzipFinished();
     void onUnzipCanceled();