Folders: Use "Problem" icon for unresolved conflicts #6277

1 files changed, 9 insertions, 3 deletions

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 96de011c1..2e784101b 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -245,9 +245,15 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
                 } else if (status == SyncResult::Undefined) {
                     return theme->syncStateIcon(SyncResult::SyncRunning);
                 } else {
-                    // keep the previous icon for the prepare phase.
-                    if (status == SyncResult::Problem) {
-                        return theme->syncStateIcon(SyncResult::Success);
+                    // The "Problem" *result* just means some files weren't
+                    // synced, so we show "Success" in these cases. But we
+                    // do use the "Problem" *icon* for unresolved conflicts.
+                    if (status == SyncResult::Success || status == SyncResult::Problem) {
+                        if (f->syncResult().hasUnresolvedConflicts()) {
+                            return theme->syncStateIcon(SyncResult::Problem);
+                        } else {
+                            return theme->syncStateIcon(SyncResult::Success);
+                        }
                     } else {
                         return theme->syncStateIcon(status);
                     }