Fixed lifetime management of resultSet.

The resultSet remains valid for the duration of the thread.
We keep the thread running until the ResultEmitter is deleted.

1 files changed, 4 insertions, 4 deletions

diff --git a/common/synclistresult.h b/common/synclistresult.h
index 5fa0efd..0a86f8c 100644
--- a/common/synclistresult.h
+++ b/common/synclistresult.h
@@ -19,20 +19,21 @@ class SyncListResult : public QList<T> {
 public:
     SyncListResult(const QSharedPointer<ResultEmitter<T> > &emitter)
         :QList<T>(),
-        mComplete(false),
         mEmitter(emitter)
     {
         emitter->onAdded([this](const T &value) {
             this->append(value);
         });
-        emitter->onComplete([this]() {
-            mComplete = true;
+        emitter->onInitialResultSetComplete([this]() {
             if (eventLoopAborter) {
                 eventLoopAborter();
                 //Be safe in case of a second invocation of the complete handler
                 eventLoopAborter = std::function<void()>();
             }
         });
+        emitter->onComplete([this]() {
+            mEmitter.clear();
+        });
         emitter->onClear([this]() {
             this->clear();
         });
@@ -46,7 +47,6 @@ public:
     }
 
 private:
-    bool mComplete;
     QSharedPointer<ResultEmitter<T> > mEmitter;
     std::function<void()> eventLoopAborter;
 };