[Pkg-owncloud-commits] [owncloud-client] 100/164: Propagate: Don't retry direct download on abort

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 668de9bf31ed4a660f1d771693afc45f5e2e6c64
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Mar 5 21:56:39 2015 +0100

    Propagate: Don't retry direct download on abort
---
 src/libsync/propagatedownload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index 73a3d2d..33538e1 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -399,7 +399,7 @@ void PropagateDownloadFileQNAM::slotGetFinished()
             _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo());
         }
 
-        if(!_item._directDownloadUrl.isEmpty()) {
+        if(!_item._directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
             // If this was with a direct download, retry without direct download
             qWarning() << "Direct download of" << _item._directDownloadUrl << "failed. Retrying through owncloud.";
             _item._directDownloadUrl.clear();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git