[Pkg-owncloud-commits] [owncloud-client] 462/470: Fix assert on restore after propagation (#4823)

[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 edc58c045fb020459e26d39d79514039364e1591
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Wed May 11 18:16:46 2016 +0200

    Fix assert on restore after propagation (#4823)
    
    The assert was there to make sure that this case wasn't happening
    to eventually be properly tested. Remove the assert for now but this
    codepath should eventually be unit tested using this specific situation.
---
 src/libsync/syncfilestatustracker.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index c749ae3..c083bd4 100644
--- a/src/libsync/syncfilestatustracker.cpp
+++ b/src/libsync/syncfilestatustracker.cpp
@@ -180,8 +180,7 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
     } else if (showWarningInSocketApi(item)) {
         _syncProblems[item._file] = SyncFileStatus::StatusWarning;
     } else {
-        // There is currently no situation where an error status set during discovery/update is fixed by propagation.
-        Q_ASSERT(_syncProblems.find(item._file) == _syncProblems.end());
+        _syncProblems.erase(item._file);
     }
 
     emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));

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