2 files changed, 6 insertions, 10 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index 46f7534..25f0f1f 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -91,13 +91,6 @@ QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
 
     // Query all resources and aggregate results
     auto resources = getResources(query.resources, ApplicationDomain::getTypeName<DomainType>());
-    if (resources.isEmpty()) {
-        Warning() << "No resources available.";
-        auto resultProvider = Akonadi2::ResultProvider<typename DomainType::Ptr>::Ptr::create();
-        model->setEmitter(resultProvider->emitter());
-        resultProvider->initialResultSetComplete(typename DomainType::Ptr());
-        return model;
-    }
     auto aggregatingEmitter = AggregatingResultEmitter<typename DomainType::Ptr>::Ptr::create();
     model->setEmitter(aggregatingEmitter);
     KAsync::iterate(resources)
@@ -114,7 +107,6 @@ QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
             future.setFinished();
         }
     }).exec();
-    //TODO if the aggregatingEmitter is still empty we're done
     model->fetchMore(QModelIndex());
 
     return model;
diff --git a/common/resultprovider.h b/common/resultprovider.h
index d94ad44..08a7d53 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -362,8 +362,12 @@ public:
 
     void fetch(const DomainType &parent) Q_DECL_OVERRIDE
     {
-        for (const auto &emitter : mEmitter) {
-            emitter->fetch(parent);
+        if (mEmitter.isEmpty()) {
+            this->initialResultSetComplete(parent);
+        } else {
+            for (const auto &emitter : mEmitter) {
+                emitter->fetch(parent);
+            }
         }
     }