From be029ab36015bfc19a40e27a42ab10be03e6eea5 Mon Sep 17 00:00:00 2001 From: Janrupf Date: Wed, 29 Dec 2021 17:08:15 +0100 Subject: [PATCH] GH-4299 Fix screenshot upload --- launcher/net/NetJob.h | 5 +++++ launcher/ui/pages/instance/ScreenshotsPage.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/launcher/net/NetJob.h b/launcher/net/NetJob.h index 2f272da4..06b23306 100644 --- a/launcher/net/NetJob.h +++ b/launcher/net/NetJob.h @@ -35,6 +35,11 @@ public: } virtual ~NetJob(); + void setNetwork(shared_qobject_ptr network) + { + m_network = network; + } + bool addNetAction(NetAction::Ptr action); NetAction::Ptr operator[](int index) diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp index 06c4379f..3fcc61fa 100644 --- a/launcher/ui/pages/instance/ScreenshotsPage.cpp +++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp @@ -314,6 +314,8 @@ void ScreenshotsPage::on_actionUpload_triggered() m_uploadActive = true; ProgressDialog dialog(this); + + job->setNetwork(APPLICATION->network()); if(dialog.execWithTask(job.get()) != QDialog::Accepted) { CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"), @@ -348,7 +350,9 @@ void ScreenshotsPage::on_actionUpload_triggered() auto albumTask = NetJob::Ptr(new NetJob("Imgur Album Creation")); auto imgurAlbum = ImgurAlbumCreation::make(uploaded); albumTask->addNetAction(imgurAlbum); + job->setNetwork(APPLICATION->network()); task.addTask(job); + albumTask->setNetwork(APPLICATION->network()); task.addTask(albumTask); m_uploadActive = true; ProgressDialog prog(this);