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

handling and are appropriately dealt with.

1 files changed, 6 insertions, 1 deletions

diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 75b9a4c..0adbd78 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -147,7 +147,7 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
                         if (error) {
                             SinkWarningCtx(mLogCtx) << "Change replay failed: " << error  << "Last replayed revision: "  << *lastReplayedRevision;
                             //We're probably not online or so, so postpone retrying
-                            return KAsync::value(KAsync::Break);
+                            return KAsync::value(KAsync::Break).then(KAsync::error<KAsync::ControlFlowFlag>(error));
                         }
                         SinkTraceCtx(mLogCtx) << "Replayed until: " << *lastReplayedRevision;
 
@@ -179,6 +179,11 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
                     emit changesReplayed();
                 }
             }
+            if (error) {
+                return KAsync::error(error);
+            } else {
+                return KAsync::null();
+            }
         }).guard(&mGuard);
 }