3 files changed, 6 insertions, 2 deletions

diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index 99a0112..3754b16 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -31,6 +31,9 @@ void MessageQueue::dequeue(const std::function<void(void *ptr, int size, std::fu
         resultHandler(valuePtr, valueSize, [this, key](bool success) {
             if (success) {
                 mStorage.remove(key.data(), key.size());
+                if (isEmpty()) {
+                    emit this->drained();
+                }
             } else {
                 //TODO re-enqueue?
             }
diff --git a/common/messagequeue.h b/common/messagequeue.h
index 0b791c6..52eeb1f 100644
--- a/common/messagequeue.h
+++ b/common/messagequeue.h
@@ -34,6 +34,7 @@ public:
     bool isEmpty();
 signals:
     void messageReady();
+    void drained();
 
 private:
     Q_DISABLE_COPY(MessageQueue);
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 8f15fef..13a3344 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -107,7 +107,7 @@ Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
         flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size);
         if (!Akonadi2::Commands::VerifyCreateEntityBuffer(verifyer)) {
             qWarning() << "invalid buffer, not a create entity buffer";
-            return Async::null<void>();
+            return Async::error<void>();
         }
     }
     auto createEntity = Akonadi2::Commands::GetCreateEntity(command);
@@ -118,7 +118,7 @@ Async::Job<void> Pipeline::newEntity(void const *command, size_t size)
         flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(createEntity->delta()->Data()), createEntity->delta()->size());
         if (!Akonadi2::VerifyEntityBuffer(verifyer)) {
             qWarning() << "invalid buffer, not an entity buffer";
-            return Async::null<void>();
+            return Async::error<void>();
         }
     }
     auto entity = Akonadi2::GetEntity(createEntity->delta()->Data());