From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Wed, 11 May 2016 16:16:46 +0000 (+0200)
Subject: Fix assert on restore after propagation (#4823)
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1172^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=edc58c045fb020459e26d39d79514039364e1591;p=nextcloud-desktop.git

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.
---

diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp
index c749ae3a3..c083bd4c6 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));