From a902726938b2382ec0f76fbcdfd545c703e6168a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 10 Oct 2019 13:21:28 +0200 Subject: [PATCH] Restoration items should appear in the sync protocol When an item is downloaded because it is restored, it shall be shown in the sync protocol. (It is also going to be shown in the not synchronized for a short while, but that's fine) --- src/libsync/syncfileitem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h index 88fec60fb2..667341be3c 100644 --- a/src/libsync/syncfileitem.h +++ b/src/libsync/syncfileitem.h @@ -197,7 +197,7 @@ public: */ bool showInProtocolTab() const { - return !showInIssuesTab() + return (!showInIssuesTab() || _status == SyncFileItem::Restoration) // Don't show conflicts that were resolved as "not a conflict after all" && !(_instruction == CSYNC_INSTRUCTION_CONFLICT && _status == SyncFileItem::Success); }