Merge branch 'jb51873' into 'master'

[buteo-sync-plugin-carddav] Don't duplicate-add unmodified remote collections.... See merge request mer-core/buteo-sync-plugin-carddav!28
sailfishos · Nov 24, 2020 · 4d55f4f · 4d55f4f
2 parents 02d8587 + f702dd6
commit 4d55f4f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/syncer.cpp b/src/syncer.cpp
@@ -222,7 +222,9 @@ bool Syncer::determineRemoteCollectionChanges(
                             remotelyModifiedCollections.append(remoteMod);
                         } else {
                             // we assume that the remote collection is unmodified.
-                            remotelyUnmodifiedCollections.append(remoteCollections.take(path));
+                            remoteCollections.remove(path);
+                            QContactCollection remoteUnmod = local; // need id etc.
+                            remotelyUnmodifiedCollections.append(remoteUnmod);
                         }
                     }
                 }