Ensure change-replay errors make it through to the correct error

handling and are appropriately dealt with.

1 files changed, 5 insertions, 2 deletions

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 3ef7eb7..b1ff29c 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -629,11 +629,14 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
         }
     })
     .then([this](const KAsync::Error &error) {
+        //We need to commit here otherwise the next change-replay step will abort the transaction
+        mSyncStore.clear();
+        mSyncTransaction.commit();
         if (error) {
             SinkWarningCtx(mLogCtx) << "Failed to replay change: " << error.errorMessage;
+            return KAsync::error(error);
         }
-        mSyncStore.clear();
-        mSyncTransaction.commit();
+        return KAsync::null();
     });
 }