Merge remote-tracking branch 'upstream/develop' into upstream_update

1 files changed, 1 insertions, 14 deletions

diff --git a/launcher/net/NetJob.h b/launcher/net/NetJob.h
index 45b9bc0f..fdea710f 100644
--- a/launcher/net/NetJob.h
+++ b/launcher/net/NetJob.h
@@ -29,7 +29,7 @@ class NetJob : public Task
 public:
     using Ptr = shared_qobject_ptr<NetJob>;
 
-    explicit NetJob(QString job_name) : Task()
+    explicit NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : Task(), m_network(network)
     {
         setObjectName(job_name);
     }
@@ -65,19 +65,6 @@ private slots:
 public slots:
     virtual void executeTask() override;
     virtual bool abort() override;
-    virtual void start(shared_qobject_ptr<QNetworkAccessManager> network) {
-        m_network = network;
-        start();
-    }
-
-protected slots:
-    void start() override {
-        if(!m_network) {
-            throw "Missing network while trying to start " + objectName();
-            return;
-        }
-        Task::start();
-    }
 
 private slots:
     void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);