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 Markus Goetz
parent 4a4d4f9bb7
commit a902726938

View File

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