1 files changed, 13 insertions, 4 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index aa3aab8..63305ab 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -425,13 +425,22 @@ public:
                 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);
-                //We copy the facade pointer to keep it alive
-                job = job.then(facade->load(query, addCallback));
+
+                // TODO The following is a necessary hack to keep the facade alive.
+                // Otherwise this would reduce to:
+                // job = job.then(facade->load(query, addCallback));
+                // We somehow have to guarantee that the facade remains valid for the duration of the job
+                job = job.then<void>([facade, query, addCallback](Async::Future<void> &future) {
+                    Async::Job<void> j = facade->load(query, addCallback);
+                    j.then<void>([&future, facade](Async::Future<void> &f) {
+                        future.setFinished();
+                        f.setFinished();
+                    }).exec();
+                });
             }
-            job.then<void>([/* eventloop,  */resultSet](Async::Future<void> &future) {
+            job.then<void>([resultSet]() {
                 qDebug() << "Query complete";
                 resultSet->complete();
-                future.setFinished();
             }).exec().waitForFinished(); //We use the eventloop provided by waitForFinished to keep the thread alive until all is done
         });
         return resultSet->emitter();