From 96608eb0a67601c9f1e88c630bd968c649fd7fc3 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 8 Oct 2015 19:26:38 +0200
Subject: Only emit the revision update once the batch is committed.

---
 common/pipeline.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'common/pipeline.cpp')

diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 93a79f5..38029a3 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -100,10 +100,12 @@ void Pipeline::startTransaction()
 
 void Pipeline::commit()
 {
+    const auto revision = Akonadi2::Storage::maxRevision(d->transaction);
     if (d->transaction) {
         d->transaction.commit();
     }
     d->transaction = Storage::Transaction();
+    emit revisionUpdated(revision);
 }
 
 Storage::Transaction &Pipeline::transaction()
@@ -387,9 +389,6 @@ void Pipeline::pipelineCompleted(PipelineState state)
     }
     state.callback();
 
-    if (state.type() != NullPipeline) {
-        emit revisionUpdated(state.revision());
-    }
     scheduleStep();
     if (d->activePipelines.isEmpty()) {
         emit pipelinesDrained();
-- 
cgit v1.2.3