1 files changed, 15 insertions, 4 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index 6054130..d2757e7 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -278,7 +278,7 @@ public:
     virtual void create(const DomainType &domainObject) = 0;
     virtual void modify(const DomainType &domainObject) = 0;
     virtual void remove(const DomainType &domainObject) = 0;
-    virtual void load(const Query &query, const std::function<void(const typename DomainType::Ptr &)> &resultCallback) = 0;
+    virtual void load(const Query &query, const std::function<void(const typename DomainType::Ptr &)> &resultCallback, const std::function<void()> &completeCallback) = 0;
 };
 
 
@@ -353,7 +353,7 @@ class Store {
 public:
     static QString storageLocation()
     {
-        return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2";
+        return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage";
     }
 
     /**
@@ -371,13 +371,24 @@ public:
             // Query all resources and aggregate results
             // query tells us in which resources we're interested
             // TODO: queries to individual resources could be parallelized
+            auto eventloop = QSharedPointer<QEventLoop>::create();
+            int completeCounter = 0;
             for(const QString &resource : query.resources) {
                 auto facade = FacadeFactory::instance().getFacade<DomainType>(resource);
                 //We have to bind an instance to the function callback. Since we use a shared pointer this keeps the result provider instance (and thus also the emitter) alive.
                 std::function<void(const typename DomainType::Ptr &)> addCallback = std::bind(&ResultProvider<typename DomainType::Ptr>::add, resultSet, std::placeholders::_1);
-                facade->load(query, addCallback);
+                //We copy the facade pointer to keep it alive
+                facade->load(query, addCallback, [&completeCounter, &query, resultSet, facade, eventloop]() {
+                    //TODO use jobs instead of this counter
+                    completeCounter++;
+                    if (completeCounter == query.resources.size()) {
+                        resultSet->complete();
+                        eventloop->quit();
+                    }
+                });
             }
-            resultSet->complete();
+            //The thread contains no eventloop, so execute one here
+            eventloop->exec(QEventLoop::ExcludeUserInputEvents);
         });
         return resultSet->emitter();
     }