aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/technic/SolderPackInstallTask.cpp
diff options
context:
space:
mode:
authorswirl <roachh@protonmail.com>2021-12-31 14:27:21 -0500
committerGitHub <noreply@github.com>2021-12-31 14:27:21 -0500
commit541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa (patch)
tree5a300af57c0207d38980319d54dc04218828aa1e /launcher/modplatform/technic/SolderPackInstallTask.cpp
parent0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff)
parentfa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (diff)
downloadPrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.tar.gz
PrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.tar.bz2
PrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.zip
Merge pull request #8 from dada513/upstream_update
Diffstat (limited to 'launcher/modplatform/technic/SolderPackInstallTask.cpp')
-rw-r--r--launcher/modplatform/technic/SolderPackInstallTask.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index 2492ee81..b5c91582 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
@@ -42,12 +42,12 @@ bool Technic::SolderPackInstallTask::abort() {
void Technic::SolderPackInstallTask::executeTask()
{
setStatus(tr("Finding recommended version:\n%1").arg(m_sourceUrl.toString()));
- m_filesNetJob.reset(new NetJob(tr("Finding recommended version")));
+ m_filesNetJob = new NetJob(tr("Finding recommended version"), m_network);
m_filesNetJob->addNetAction(Net::Download::makeByteArray(m_sourceUrl, &m_response));
auto job = m_filesNetJob.get();
connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::versionSucceeded);
connect(job, &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
- m_filesNetJob->start(m_network);
+ m_filesNetJob->start();
}
void Technic::SolderPackInstallTask::versionSucceeded()
@@ -67,12 +67,12 @@ void Technic::SolderPackInstallTask::versionSucceeded()
}
setStatus(tr("Resolving modpack files:\n%1").arg(m_sourceUrl.toString()));
- m_filesNetJob.reset(new NetJob(tr("Resolving modpack files")));
+ m_filesNetJob = new NetJob(tr("Resolving modpack files"), m_network);
m_filesNetJob->addNetAction(Net::Download::makeByteArray(m_sourceUrl, &m_response));
auto job = m_filesNetJob.get();
connect(job, &NetJob::succeeded, this, &Technic::SolderPackInstallTask::fileListSucceeded);
connect(job, &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
- m_filesNetJob->start(m_network);
+ m_filesNetJob->start();
}
void Technic::SolderPackInstallTask::fileListSucceeded()
@@ -99,7 +99,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
m_filesNetJob.reset();
return;
}
- m_filesNetJob.reset(new NetJob(tr("Downloading modpack")));
+ m_filesNetJob = new NetJob(tr("Downloading modpack"), m_network);
int i = 0;
for (auto &modUrl: modUrls)
{
@@ -113,7 +113,7 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
connect(m_filesNetJob.get(), &NetJob::succeeded, this, &Technic::SolderPackInstallTask::downloadSucceeded);
connect(m_filesNetJob.get(), &NetJob::progress, this, &Technic::SolderPackInstallTask::downloadProgressChanged);
connect(m_filesNetJob.get(), &NetJob::failed, this, &Technic::SolderPackInstallTask::downloadFailed);
- m_filesNetJob->start(m_network);
+ m_filesNetJob->start();
}
void Technic::SolderPackInstallTask::downloadSucceeded()