From 20f6d6470bbb812d0aecd68c2fbb148daebd14d7 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sun, 19 Jul 2015 20:20:10 +0200
Subject: Skip commands we fail to process so we don't get stuck

---
 common/genericresource.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'common/genericresource.cpp')

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index a500aed..5dfa9b5 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -93,7 +93,7 @@ private slots:
                 queue->dequeue(
                     [this, &future](void *ptr, int size, std::function<void(bool success)> messageQueueCallback) {
                         auto callback = [messageQueueCallback, &future](bool success) {
-                            messageQueueCallback(success);
+                            messageQueueCallback(true);
                             future.setValue(!success);
                             future.setFinished();
                         };
@@ -105,9 +105,11 @@ private slots:
                             return;
                         }
                         auto queuedCommand = Akonadi2::GetQueuedCommand(ptr);
-                        Trace() << "Dequeued Command: " << Akonadi2::Commands::name(queuedCommand->commandId());
+                        const auto commandId = queuedCommand->commandId();
+                        Trace() << "Dequeued Command: " << Akonadi2::Commands::name(commandId);
                         processQueuedCommand(queuedCommand).then<void>(
-                            [callback]() {
+                            [callback, commandId]() {
+                                Trace() << "Command pipeline processed: " << Akonadi2::Commands::name(commandId);
                                 callback(true);
                             },
                             [callback](int errorCode, QString errorMessage) {
-- 
cgit v1.2.3