diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-08-10 16:54:19 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-08-12 16:39:55 +0300 |
| commit | 473f4fe6aa51253fb71b5dccd9ab701dfcc4ea02 (patch) | |
| tree | f85a4a611e9773ebaf9283c3acc1c039689a6038 /src/gui/issueswidget.cpp | |
| parent | 2bae6f6c4e2d616d5515ad51afd4c4f00fbaf166 (diff) | |
Don't treat exclude as error
Diffstat (limited to 'src/gui/issueswidget.cpp')
| -rw-r--r-- | src/gui/issueswidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/issueswidget.cpp b/src/gui/issueswidget.cpp index a5b9f2e2f..32b921d06 100644 --- a/src/gui/issueswidget.cpp +++ b/src/gui/issueswidget.cpp @@ -43,7 +43,8 @@ namespace { bool persistsUntilLocalDiscovery(const OCC::ProtocolItem &data) { return data.status() == OCC::SyncFileItem::Conflict - || (data.status() == OCC::SyncFileItem::FileIgnored && data.direction() == OCC::SyncFileItem::Up); + || (data.status() == OCC::SyncFileItem::FileIgnored && data.direction() == OCC::SyncFileItem::Up) + || data.status() == OCC::SyncFileItem::Excluded; } } @@ -142,7 +143,7 @@ void IssuesWidget::slotProgressInfo(const QString &folder, const ProgressInfo &p if (item.folder() != f) { return false; } - if (item.direction() == SyncFileItem::None) { + if (item.direction() == SyncFileItem::None && item.status() != SyncFileItem::Excluded) { // TODO: don't clear syncErrors and excludes for now. // make them either unique or remove them on the next sync? return false; |