Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

4 files changed, 5 insertions, 2 deletions

diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index d598d77e..d548c89a 100644
--- a/launcher/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
@@ -81,7 +81,7 @@ void ImgurAlbumCreation::executeTask()
     connect(rep, &QNetworkReply::sslErrors, this, &ImgurAlbumCreation::sslErrors);
 }
 
-void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
+void ImgurAlbumCreation::downloadError([[maybe_unused]] QNetworkReply::NetworkError error)
 {
     qDebug() << m_reply->errorString();
     m_state = State::Failed;
diff --git a/launcher/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h
index 3a82a956..bb71bec2 100644
--- a/launcher/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@@ -50,6 +50,8 @@ class ImgurAlbumCreation : public NetAction {
     QString deleteHash() const { return m_deleteHash; }
     QString id() const { return m_id; }
 
+    void init() override{};
+
    protected slots:
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
     void downloadError(QNetworkReply::NetworkError error) override;
diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index 706af7ba..29499a20 100644
--- a/launcher/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
@@ -96,7 +96,7 @@ void ImgurUpload::executeTask()
     connect(rep, &QNetworkReply::sslErrors, this, &ImgurUpload::sslErrors);
 }
 
-void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
+void ImgurUpload::downloadError([[maybe_unused]] QNetworkReply::NetworkError error)
 {
     qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
     if (finished) {
diff --git a/launcher/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h
index 8714e0c0..542255b2 100644
--- a/launcher/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@@ -44,6 +44,7 @@ class ImgurUpload : public NetAction {
 
     explicit ImgurUpload(ScreenShot::Ptr shot);
     static Ptr make(ScreenShot::Ptr shot) { return Ptr(new ImgurUpload(shot)); }
+    void init() override{};
 
    protected slots:
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;