aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/modplatform/technic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-12-31 05:27:59 +0100
committerPetr Mrázek <peterix@gmail.com>2021-12-31 05:27:59 +0100
commit9579231ccc36d9d32f4d5571ced91e8fe7851643 (patch)
treed91a8a010d6159d6a9b058b8383fc1da0d765bb7 /launcher/ui/pages/modplatform/technic
parent9cc168c5261c6cd0523287e995da58beee8f5096 (diff)
downloadPrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.tar.gz
PrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.tar.bz2
PrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.zip
NOISSUE fix build and change how NetJob is used
Feed it network upfront...
Diffstat (limited to 'launcher/ui/pages/modplatform/technic')
-rw-r--r--launcher/ui/pages/modplatform/technic/TechnicModel.cpp8
-rw-r--r--launcher/ui/pages/modplatform/technic/TechnicPage.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 63c2d4c4..0167f746 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -91,7 +91,7 @@ void Technic::ListModel::searchWithTerm(const QString& term)
void Technic::ListModel::performSearch()
{
- NetJob *netJob = new NetJob("Technic::Search");
+ NetJob *netJob = new NetJob("Technic::Search", APPLICATION->network());
QString searchUrl = "";
if (currentSearchTerm.isEmpty()) {
searchUrl = "https://api.technicpack.net/trending?build=multimc";
@@ -104,7 +104,7 @@ void Technic::ListModel::performSearch()
}
netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
jobPtr = netJob;
- jobPtr->start(APPLICATION->network());
+ jobPtr->start();
QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::searchRequestFinished);
QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
}
@@ -216,7 +216,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
}
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("TechnicPacks", QString("logos/%1").arg(logo));
- NetJob *job = new NetJob(QString("Technic Icon Download %1").arg(logo));
+ NetJob *job = new NetJob(QString("Technic Icon Download %1").arg(logo), APPLICATION->network());
job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
auto fullPath = entry->getFullPath();
@@ -231,7 +231,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
logoFailed(logo);
});
- job->start(APPLICATION->network());
+ job->start();
m_loadingLogos.append(logo);
}
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index ac69675c..67f6e52c 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -110,8 +110,8 @@ void TechnicPage::suggestCurrent()
metadataLoaded();
return;
}
-
- NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name));
+
+ NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name), APPLICATION->network());
std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
QString slug = current.slug;
netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.technicpack.net/modpack/%1?build=multimc").arg(slug), response.get()));
@@ -167,7 +167,7 @@ void TechnicPage::suggestCurrent()
current.metadataLoaded = true;
metadataLoaded();
});
- netJob->start(APPLICATION->network());
+ netJob->start();
}
// expects current.metadataLoaded to be true