diff options
| author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
| commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
| tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /logic/net/CacheDownload.cpp | |
| parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
| parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
| download | PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.bz2 PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
Diffstat (limited to 'logic/net/CacheDownload.cpp')
| -rw-r--r-- | logic/net/CacheDownload.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/logic/net/CacheDownload.cpp b/logic/net/CacheDownload.cpp index 873d3a2e..6eadae39 100644 --- a/logic/net/CacheDownload.cpp +++ b/logic/net/CacheDownload.cpp @@ -35,14 +35,14 @@ void CacheDownload::start() { if (!m_entry->stale) { - emit succeeded(index_within_job); + emit succeeded(m_index_within_job); return; } m_output_file.setFileName(m_target_path); // if there already is a file and md5 checking is in effect and it can be opened if (!ensureFilePathExists(m_target_path)) { - emit failed(index_within_job); + emit failed(m_index_within_job); return; } QLOG_INFO() << "Downloading " << m_url.toString(); @@ -69,7 +69,9 @@ void CacheDownload::start() void CacheDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) { - emit progress(index_within_job, bytesReceived, bytesTotal); + m_total_progress = bytesTotal; + m_progress = bytesReceived; + emit progress(m_index_within_job, bytesReceived, bytesTotal); } void CacheDownload::downloadError(QNetworkReply::NetworkError error) @@ -116,7 +118,7 @@ void CacheDownload::downloadFinished() MMC->metacache()->updateEntry(m_entry); m_reply.reset(); - emit succeeded(index_within_job); + emit succeeded(m_index_within_job); return; } // else the download failed @@ -125,7 +127,7 @@ void CacheDownload::downloadFinished() m_output_file.close(); m_output_file.remove(); m_reply.reset(); - emit failed(index_within_job); + emit failed(m_index_within_job); return; } } @@ -140,7 +142,7 @@ void CacheDownload::downloadReadyRead() * Can't open the file... the job failed */ m_reply->abort(); - emit failed(index_within_job); + emit failed(m_index_within_job); return; } } |