From e5d17519eb25fe7c0428e939e296f967060ff17f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 15 Jun 2016 07:00:48 +0200
Subject: Remember the revision we loaded in the result set.

Otherwise we reload the same entities over and over.
---
 common/queryrunner.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'common/queryrunner.cpp')

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index f2a7753..90f046b 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -94,6 +94,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                     if (query.liveQuery) {
                         mResourceAccess->sendRevisionReplayedCommand(newRevisionAndReplayedEntities.first);
                     }
+                    resultProvider->setRevision(newRevisionAndReplayedEntities.first);
                     resultProvider->initialResultSetComplete(parent);
                 })
                 .exec();
@@ -111,9 +112,10 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                        const auto newRevisionAndReplayedEntities = worker.executeIncrementalQuery(query, *resultProvider);
                        return newRevisionAndReplayedEntities;
                    })
-                .template then<void, QPair<qint64, qint64> >([query, this](const QPair<qint64, qint64> &newRevisionAndReplayedEntities) {
+                .template then<void, QPair<qint64, qint64> >([query, this, resultProvider](const QPair<qint64, qint64> &newRevisionAndReplayedEntities) {
                     // Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise.
                     mResourceAccess->sendRevisionReplayedCommand(newRevisionAndReplayedEntities.first);
+                    resultProvider->setRevision(newRevisionAndReplayedEntities.first);
                 });
         });
         // Ensure the connection is open, if it wasn't already opened
-- 
cgit v1.2.3