1 files changed, 19 insertions, 12 deletions

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index c6a6b86..f2a7753 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -78,23 +78,31 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
         const QByteArray parentId = parent ? parent->identifier() : QByteArray();
         Trace() << "Running fetcher. Offset: " << mOffset[parentId] << " Batchsize: " << mBatchSize;
         auto resultProvider = mResultProvider;
-        async::run<QPair<qint64, qint64> >([=]() {
+        if (query.synchronousQuery) {
             QueryWorker<DomainType> worker(query, instanceIdentifier, factory, bufferType, mResultTransformation);
-            const auto  newRevisionAndReplayedEntities = worker.executeInitialQuery(query, parent, *resultProvider, mOffset[parentId], mBatchSize);
-            return newRevisionAndReplayedEntities;
-        })
-            .template then<void, QPair<qint64, qint64>>([=](const QPair<qint64, qint64> &newRevisionAndReplayedEntities) {
-                mOffset[parentId] += newRevisionAndReplayedEntities.second;
-                // Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise.
-                if (query.liveQuery) {
-                    mResourceAccess->sendRevisionReplayedCommand(newRevisionAndReplayedEntities.first);
-                }
+            worker.executeInitialQuery(query, parent, *resultProvider, mOffset[parentId], mBatchSize);
+            resultProvider->initialResultSetComplete(parent);
+        } else {
+            async::run<QPair<qint64, qint64> >([=]() {
+                QueryWorker<DomainType> worker(query, instanceIdentifier, factory, bufferType, mResultTransformation);
+                const auto  newRevisionAndReplayedEntities = worker.executeInitialQuery(query, parent, *resultProvider, mOffset[parentId], mBatchSize);
+                return newRevisionAndReplayedEntities;
             })
-            .exec();
+                .template then<void, QPair<qint64, qint64>>([=](const QPair<qint64, qint64> &newRevisionAndReplayedEntities) {
+                    mOffset[parentId] += newRevisionAndReplayedEntities.second;
+                    // Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise.
+                    if (query.liveQuery) {
+                        mResourceAccess->sendRevisionReplayedCommand(newRevisionAndReplayedEntities.first);
+                    }
+                    resultProvider->initialResultSetComplete(parent);
+                })
+                .exec();
+        }
     });
 
     // In case of a live query we keep the runner for as long alive as the result provider exists
     if (query.liveQuery) {
+        Q_ASSERT(!query.synchronousQuery);
         // Incremental updates are always loaded directly, leaving it up to the result to discard the changes if they are not interesting
         setQuery([=]() -> KAsync::Job<void> {
             auto resultProvider = mResultProvider;
@@ -233,7 +241,6 @@ QPair<qint64, qint64> QueryWorker<DomainType>::executeInitialQuery(
     Sink::EntityReader<DomainType> reader(*mDomainTypeAdaptorFactory, mResourceInstanceIdentifier, transaction);
     auto revisionAndReplayedEntities = reader.executeInitialQuery(modifiedQuery, offset, batchsize, resultProviderCallback(query, resultProvider));
     Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
-    resultProvider.initialResultSetComplete(parent);
     return revisionAndReplayedEntities;
 }