2 files changed, 4 insertions, 0 deletions

diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 532cca8..4870551 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -99,6 +99,9 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
             SinkTraceCtx(mLogCtx) << "Changereplay from " << *lastReplayedRevision << " to " << *topRevision;
             return KAsync::doWhile(
                 [this, lastReplayedRevision, topRevision]() -> KAsync::Job<KAsync::ControlFlowFlag> {
+                    if (!mGuard) {
+                        return KAsync::value(KAsync::Break);
+                    }
                     if (*lastReplayedRevision >= *topRevision) {
                         SinkTraceCtx(mLogCtx) << "Done replaying";
                         return KAsync::value(KAsync::Break);
diff --git a/common/changereplay.h b/common/changereplay.h
index 3ca896e..2772da9 100644
--- a/common/changereplay.h
+++ b/common/changereplay.h
@@ -63,6 +63,7 @@ private:
     bool mReplayInProgress;
     Sink::Storage::DataStore::Transaction mMainStoreTransaction;
     Sink::Log::Context mLogCtx;
+    QSharedPointer<QObject> mGuard;
 };
 
 class NullChangeReplay : public ChangeReplay