Commit ffa20e75 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Fix ItemSync merge type fallback

Always fallback to RID merge, even when GID merge is requsted, but no GID
is present.

(cherry picked from commit d8b5da7b)
parent 43d5659a
......@@ -130,10 +130,10 @@ void ItemSyncPrivate::createOrMerge(const Item &item)
mPendingJobs++;
ItemCreateJob *create = new ItemCreateJob(item, mSyncCollection, subjobParent());
ItemCreateJob::MergeOptions merge = ItemCreateJob::Silent;
if (mMergeMode == ItemSync::RIDMerge) {
merge |= ItemCreateJob::RID;
} else if (mMergeMode == ItemSync::GIDMerge && !item.gid().isEmpty()) {
if (mMergeMode == ItemSync::GIDMerge && !item.gid().isEmpty()) {
merge |= ItemCreateJob::GID;
} else {
merge |= ItemCreateJob::RID;
}
create->setMerge(merge);
q->connect(create, SIGNAL(result(KJob*)), q, SLOT(slotLocalChangeDone(KJob*)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment