SocketAPI: Don't use ERROR for SoftErrors owncloud#3944

ckamm · Dec 10, 2015 · b94281d · b94281d
1 parent f65a29d
commit b94281d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -622,9 +622,16 @@ void Folder::slotWatchedPathChanged(const QString& path)
     }
 }
 
+static bool showErrorInSocketApi(const SyncFileItemPtr& item)
+{
+    const auto status = item->_status;
+    return status == SyncFileItem::NormalError
+        || status == SyncFileItem::FatalError;
+}
+
 static void addErroredSyncItemPathsToList(const SyncFileItemVector& items, QSet<QString>* set) {
-    Q_FOREACH(const SyncFileItemPtr &item, items) {
-        if (item->hasErrorStatus()) {
+    foreach (const SyncFileItemPtr &item, items) {
+        if (showErrorInSocketApi(item)) {
             set->insert(item->_file);
         }
     }
@@ -1090,7 +1097,7 @@ void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 // a item is completed: count the errors and forward to the ProgressDispatcher
 void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& job)
 {
-    if (item.hasErrorStatus()) {
+    if (showErrorInSocketApi(item)) {
         _stateLastSyncItemsWithErrorNew.insert(item._file);
     }