aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/dialogs
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/dialogs
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/dialogs')
-rw-r--r--launcher/ui/dialogs/AboutDialog.cpp4
-rw-r--r--launcher/ui/dialogs/UpdateDialog.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 501156d0..9795c38b 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -133,10 +133,10 @@ AboutDialog::~AboutDialog()
void AboutDialog::loadPatronList()
{
- netJob = new NetJob("Patreon Patron List");
+ netJob = new NetJob("Patreon Patron List", APPLICATION->network());
netJob->addNetAction(Net::Download::makeByteArray(QUrl("https://files.multimc.org/patrons.txt"), &dataSink));
connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded);
- netJob->start(APPLICATION->network());
+ netJob->start();
}
void AboutDialog::patronListLoaded()
diff --git a/launcher/ui/dialogs/UpdateDialog.cpp b/launcher/ui/dialogs/UpdateDialog.cpp
index 4a6a1fdd..c0f6074c 100644
--- a/launcher/ui/dialogs/UpdateDialog.cpp
+++ b/launcher/ui/dialogs/UpdateDialog.cpp
@@ -34,7 +34,7 @@ UpdateDialog::~UpdateDialog()
void UpdateDialog::loadChangelog()
{
auto channel = APPLICATION->settings()->get("UpdateChannel").toString();
- dljob.reset(new NetJob("Changelog"));
+ dljob = new NetJob("Changelog", APPLICATION->network());
QString url;
if(channel == "stable")
{
@@ -49,7 +49,7 @@ void UpdateDialog::loadChangelog()
dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
connect(dljob.get(), &NetJob::succeeded, this, &UpdateDialog::changelogLoaded);
connect(dljob.get(), &NetJob::failed, this, &UpdateDialog::changelogFailed);
- dljob->start(APPLICATION->network());
+ dljob->start();
}
QString reprocessMarkdown(QByteArray markdown)