diff options
Diffstat (limited to 'installerbuilder')
| -rw-r--r-- | installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp | 3 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/downloadarchivesjob.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp index 4de001e12..fbb7b5d28 100644 --- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp +++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp @@ -1163,7 +1163,8 @@ void KDUpdater::HttpDownloader::httpReadyRead() void KDUpdater::HttpDownloader::httpError(QNetworkReply::NetworkError) { - httpDone(true); + if (!d->aborted) + httpDone(true); } void KDUpdater::HttpDownloader::cancelDownload() diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp index dbfb471f6..f0827dbe3 100644 --- a/installerbuilder/libinstaller/downloadarchivesjob.cpp +++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp @@ -241,7 +241,7 @@ void DownloadArchivesJob::registerFile() } const QByteArray archiveHash = hash.result().toHex(); - if (archiveHash != m_currentHash) { + if ((archiveHash != m_currentHash) && (!m_canceled)) { //TODO: Maybe we should try to download the file again automatically const QMessageBox::Button res = MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), @@ -276,6 +276,9 @@ void DownloadArchivesJob::downloadCanceled() void DownloadArchivesJob::downloadFailed(const QString &error) { + if (m_canceled) + return; + const QMessageBox::StandardButton b = MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("archiveDownloadError"), tr("Download Error"), tr("Could not download archive: %1 : %2") |