diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-28 20:52:14 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-28 20:52:14 +0200 |
| commit | 53b4bd019fe6b34559da1ce9c92533c9f79301ac (patch) | |
| tree | 2673f44ed5a46fcc7670b87277ff96d2847fbffc /logic/net | |
| parent | f032e32133023ed8396fc2b6ead7eadc2816a25b (diff) | |
| download | MultiMC-53b4bd019fe6b34559da1ce9c92533c9f79301ac.tar MultiMC-53b4bd019fe6b34559da1ce9c92533c9f79301ac.tar.gz MultiMC-53b4bd019fe6b34559da1ce9c92533c9f79301ac.tar.lz MultiMC-53b4bd019fe6b34559da1ce9c92533c9f79301ac.tar.xz MultiMC-53b4bd019fe6b34559da1ce9c92533c9f79301ac.zip | |
NOISSUE fix bug in unpacking of forge pack200 jar files
This caused failed downloads and broken files to be used.
Diffstat (limited to 'logic/net')
| -rw-r--r-- | logic/net/CacheDownload.cpp | 5 | ||||
| -rw-r--r-- | logic/net/HttpMetaCache.cpp | 1 | ||||
| -rw-r--r-- | logic/net/NetAction.h | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/logic/net/CacheDownload.cpp b/logic/net/CacheDownload.cpp index d79feb14..1ac55180 100644 --- a/logic/net/CacheDownload.cpp +++ b/logic/net/CacheDownload.cpp @@ -182,8 +182,11 @@ void CacheDownload::downloadReadyRead() { qCritical() << "Failed writing into " + m_target_path; m_status = Job_Failed; - m_reply->abort(); + m_output_file->cancelWriting(); + m_output_file.reset(); emit failed(m_index_within_job); + wroteAnyData = false; + return; } wroteAnyData = true; } diff --git a/logic/net/HttpMetaCache.cpp b/logic/net/HttpMetaCache.cpp index 68bfa89c..ea3e2834 100644 --- a/logic/net/HttpMetaCache.cpp +++ b/logic/net/HttpMetaCache.cpp @@ -19,7 +19,6 @@ #include <QFileInfo> #include <QFile> -#include <QTemporaryFile> #include <QDateTime> #include <QCryptographicHash> diff --git a/logic/net/NetAction.h b/logic/net/NetAction.h index 1d7eb94b..3c395605 100644 --- a/logic/net/NetAction.h +++ b/logic/net/NetAction.h @@ -32,7 +32,7 @@ enum JobStatus }; typedef std::shared_ptr<class NetAction> NetActionPtr; -class MULTIMC_LOGIC_EXPORT NetAction : public QObject, public std::enable_shared_from_this<NetAction> +class MULTIMC_LOGIC_EXPORT NetAction : public QObject { Q_OBJECT protected: @@ -54,10 +54,6 @@ public: { return m_failures; } - NetActionPtr getSharedPtr() - { - return shared_from_this(); - } public: /// the network reply |