Merge branch 'fixup' into 'master'

[buteo-sync-plugin-caldav] Fix update of upstream incidences. See merge request mer-core/buteo-sync-plugin-caldav!48
sailfishos · Aug 14, 2019 · ad96546 · ad96546
2 parents 2830d2c + 8df42d0
commit ad96546
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/notebooksyncagent.cpp b/src/notebooksyncagent.cpp
@@ -1077,10 +1077,8 @@ bool NotebookSyncAgent::updateIncidence(KCalCore::Incidence::Ptr incidence,
     const QString &nbuid = QStringLiteral("NBUID:%1:%2").arg(mNotebook->uid()).arg(incidence->uid());
 
     // Load from storage any matching incidence by uid or modified uid.
-    if (!mStorage->load(incidence->uid(), incidence->hasRecurrenceId() ? incidence->recurrenceId() : KDateTime())) {
-        if (mStorage->load(nbuid, incidence->hasRecurrenceId() ? incidence->recurrenceId() : KDateTime()))
-            incidence->setUid(nbuid);
-    }
+    mStorage->load(incidence->uid(), incidence->hasRecurrenceId() ? incidence->recurrenceId() : KDateTime());
+    mStorage->load(nbuid, incidence->hasRecurrenceId() ? incidence->recurrenceId() : KDateTime());
 
     KCalCore::Incidence::Ptr storedIncidence;
     switch (incidence->type()) {