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)
This commit is contained in:
Olivier Goffart 2019-10-10 13:21:28 +02:00 committed by Kevin Ottens
parent cb38bb2b5e
commit ee611e6004
No known key found for this signature in database
GPG Key ID: 074BBBCB8DECC9E2

View File

@ -190,7 +190,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);
}