From b2f52e3ffc5b2305f5275f18376daac7612f2e7b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 17 Jun 2016 09:10:16 +0200 Subject: If the changereplay failed we have to stop. Otherwise we would never replay changes that failed because we were offline or so. --- common/changereplay.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/changereplay.cpp b/common/changereplay.cpp index a17fc88..51443e8 100644 --- a/common/changereplay.cpp +++ b/common/changereplay.cpp @@ -96,7 +96,6 @@ KAsync::Job ChangeReplay::replayNextRevision() [&lastReplayedRevision, type, this, &replayJob](const QByteArray &key, const QByteArray &value) -> bool { Trace() << "Replaying " << key; replayJob = replay(type, key, value); - // TODO make for loop async, and pass to async replay function together with type return false; }, [key](const Storage::Error &) { ErrorMsg() << "Failed to replay change " << key; }); @@ -108,9 +107,9 @@ KAsync::Job ChangeReplay::replayNextRevision() }, [this, revision, recordReplayedRevision](int, QString) { Trace() << "Change replay failed" << revision; - recordReplayedRevision(revision); - //replay until we're done - replayNextRevision().exec(); + //We're probably not online or so, so postpone retrying + mReplayInProgress = false; + emit changesReplayed(); }); } else { Trace() << "No changes to replay"; -- cgit v1.2.3