[Pkg-owncloud-commits] [owncloud-client] 79/115: Propagator: If the sync was interrupted by pausing, do not show error.

[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 617887a0c6a5aa8bf39407992ab2591ad777b58c
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Aug 19 14:14:01 2014 +0200

    Propagator: If the sync was interrupted by pausing, do not show error.
    
    Handle problems which happen because of pausing the sync as soft errors
    rather than normal errors which are blacklisted and displayed in the
    gui.
    
    This fixes bug #1959
---
 src/mirall/owncloudpropagator.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 9a651f0..46985c4 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -53,6 +53,14 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
     } else {
         _item._errorString = errorString;
     }
+
+    if( _propagator->_abortRequested.fetchAndAddRelaxed(0) ) {
+        // an abort request is ongoing. Change the status to Soft-Error
+
+        status = SyncFileItem::SoftError;
+        _item._errorString = tr("Operation was canceled by user interaction.");
+    }
+
     _item._status = status;
 
     // Blacklisting

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