Do not display error messages if user aborts the sync run.

3 files changed, 17 insertions, 9 deletions

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 297ef2e4e..65d05936b 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -452,8 +452,10 @@ void Folder::slotTerminateSync(bool block)
 
     if( _thread && _csync ) {
         _csync->abort();
-        _errors.append( tr("The CSync thread terminated.") );
-        _csyncError = true;
+
+        // Do not display an error message, user knows his own actions.
+        // _errors.append( tr("The CSync thread terminated.") );
+        // _csyncError = true;
         if (!block) {
             setSyncState(SyncResult::SyncAbortRequested);
             return;
@@ -657,7 +659,7 @@ void Folder::slotCsyncUnavailable()
 
 void Folder::slotCSyncFinished()
 {
-    qDebug() << "-> CSync Finished slot with error " << _csyncError;
+    qDebug() << "-> CSync Finished slot with error " << _csyncError << "warn count" << _syncResult.warnCount();
     _watcher->setEventsEnabledDelayed(2000);
     _pollTimer.start();
     _timeSinceLastSync.restart();
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index be3ca71ab..44d109589 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -372,15 +372,20 @@ void PropagateUploadFile::start()
               const QString errMsg = tr("Local file changed during sync, syncing once it arrived completely");
               done( SyncFileItem::SoftError, errMsg );
               emit progress(Progress::Error, _item._file, 0,
-                            (quint64) errMsg.constData() );
+                            (quint64) "Local file changed during sync, syncing once it arrived completely"); // FIXME: Use errMsg
 
               return;
+            } else if( state == HBF_USER_ABORTED ) {
+                const QString errMsg = tr("Sync was aborted by user.");
+                done( SyncFileItem::SoftError, errMsg);
+                emit progress(Progress::Error, _item._file, 0,
+                              (quint64) "User terminated sync process!" ); // FIXME: Use errMsg
+            } else {
+                // FIXME: find out the error class.
+                _item._httpErrorCode = hbf_fail_http_code(trans.data());
+                done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state));
+                emit progress(Progress::EndUpload, _item._file, 0, _item._size);
             }
-            // FIXME: find out the error class.
-            _item._httpErrorCode = hbf_fail_http_code(trans.data());
-            done(SyncFileItem::NormalError, hbf_error_string(trans.data(), state));
-            emit progress(Progress::EndUpload, _item._file, 0, _item._size);
-
             return;
         }
 
diff --git a/src/mirall/owncloudpropagator.h b/src/mirall/owncloudpropagator.h
index 6a2e89482..11c31aece 100644
--- a/src/mirall/owncloudpropagator.h
+++ b/src/mirall/owncloudpropagator.h
@@ -172,6 +172,7 @@ signals:
     void completed(const SyncFileItem &);
     void progress(Progress::Kind, const QString &filename, quint64 bytes, quint64 total);
     void finished();
+
 };
 
 }