2 files changed, 19 insertions, 2 deletions

diff --git a/common/resultprovider.h b/common/resultprovider.h
index 7f090e9..a064ab5 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -346,8 +346,14 @@ public:
         emitter->onRemoved([this](const DomainType &value) {
             this->remove(value);
         });
-        emitter->onInitialResultSetComplete([this](const DomainType &value) {
-            this->initialResultSetComplete(value);
+        auto ptr = emitter.data();
+        emitter->onInitialResultSetComplete([this, ptr](const DomainType &parent) {
+            auto hashValue = qHash(parent);
+            mInitialResultSetInProgress.remove(hashValue, ptr);
+            //Normally a parent is only in a single resource, except the toplevel (invalid) parent
+            if (!mInitialResultSetInProgress.contains(hashValue)) {
+                this->initialResultSetComplete(parent);
+            }
         });
         emitter->onComplete([this]() {
             this->complete();
@@ -365,6 +371,7 @@ public:
             this->initialResultSetComplete(parent);
         } else {
             for (const auto &emitter : mEmitter) {
+                mInitialResultSetInProgress.insert(qHash(parent), emitter.data());
                 emitter->fetch(parent);
             }
         }
@@ -372,6 +379,7 @@ public:
 
 private:
     QList<typename ResultEmitter<DomainType>::Ptr> mEmitter;
+    QMultiMap<qint64, ResultEmitter<DomainType>*> mInitialResultSetInProgress;
 };
 
 
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 78e1d1e..ff79c82 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -265,9 +265,18 @@ private Q_SLOTS:
         Akonadi2::Query query;
         query.liveQuery = false;
 
+        int childrenFetchedCount = 0;
         auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);
+        QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [&childrenFetchedCount](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
+            if (roles.contains(Akonadi2::Store::ChildrenFetchedRole)) {
+                childrenFetchedCount++;
+            }
+        });
         QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
         QCOMPARE(model->rowCount(QModelIndex()), 2);
+        //Ensure children fetched is only emitted once (when all resources are done)
+        QTest::qWait(50);
+        QCOMPARE(childrenFetchedCount, 1);
     }