0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-4299 Fix screenshot upload

Browse Source
This commit is contained in:
Janrupf 2021-12-29 17:08:15 +01:00
parent 6fe07561fe
commit be029ab360
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/net/NetJob.h
View File

@ -35,6 +35,11 @@ public:
} }
virtual ~NetJob(); virtual ~NetJob();
void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network)
{
m_network = network;
}
bool addNetAction(NetAction::Ptr action); bool addNetAction(NetAction::Ptr action);
NetAction::Ptr operator[](int index) NetAction::Ptr operator[](int index)

4
launcher/ui/pages/instance/ScreenshotsPage.cpp
View File

@ -314,6 +314,8 @@ void ScreenshotsPage::on_actionUpload_triggered()
m_uploadActive = true; m_uploadActive = true;
ProgressDialog dialog(this); ProgressDialog dialog(this);
job->setNetwork(APPLICATION->network());
if(dialog.execWithTask(job.get()) != QDialog::Accepted) if(dialog.execWithTask(job.get()) != QDialog::Accepted)
{ {
CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"), 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 albumTask = NetJob::Ptr(new NetJob("Imgur Album Creation"));
auto imgurAlbum = ImgurAlbumCreation::make(uploaded); auto imgurAlbum = ImgurAlbumCreation::make(uploaded);
albumTask->addNetAction(imgurAlbum); albumTask->addNetAction(imgurAlbum);
job->setNetwork(APPLICATION->network());
task.addTask(job); task.addTask(job);
albumTask->setNetwork(APPLICATION->network());
task.addTask(albumTask); task.addTask(albumTask);
m_uploadActive = true; m_uploadActive = true;
ProgressDialog prog(this); ProgressDialog prog(this);