3 files changed, 22 insertions, 6 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index c6f5582..5cb3b69 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -2,6 +2,7 @@
 #include "clientapi.h"
 #include "resourceaccess.h"
 #include "commands.h"
+#include "log.h"
 
 namespace async
 {
@@ -39,10 +40,19 @@ QByteArray getTypeName<AkonadiResource>()
 
 void Store::shutdown(const QByteArray &identifier)
 {
-    Akonadi2::ResourceAccess resourceAccess(identifier);
-    //FIXME this starts the resource, just to shut it down again if it's not running in the first place.
-    resourceAccess.open();
-    resourceAccess.sendCommand(Akonadi2::Commands::ShutdownCommand).exec().waitForFinished();
+    Trace() << "shutdown";
+    ResourceAccess::connectToServer(identifier).then<void, QSharedPointer<QLocalSocket>>([identifier](const QSharedPointer<QLocalSocket> &socket, Async::Future<void> &future) {
+        //We can't currently reuse the socket
+        socket->close();
+        auto resourceAccess = QSharedPointer<Akonadi2::ResourceAccess>::create(identifier);
+        resourceAccess->open();
+        resourceAccess->sendCommand(Akonadi2::Commands::ShutdownCommand).then<void>([&future, resourceAccess]() {
+            future.setFinished();
+        }).exec();
+    },
+    [](int, const QString &) {
+        //Resource isn't started, nothing to shutdown
+    }).exec().waitForFinished();
 }
 
 } // namespace Akonadi2
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index c6d701d..28aaf2e 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -84,7 +84,7 @@ ResourceAccess::Private::Private(const QByteArray &name, ResourceAccess *q)
 }
 
 //Connects to server and returns connected socket on success
-static Async::Job<QSharedPointer<QLocalSocket> > connectToServer(const QByteArray &identifier)
+Async::Job<QSharedPointer<QLocalSocket> > ResourceAccess::connectToServer(const QByteArray &identifier)
 {
     auto s = QSharedPointer<QLocalSocket>::create();
     return Async::start<QSharedPointer<QLocalSocket> >([identifier, s](Async::Future<QSharedPointer<QLocalSocket> > &future) {
@@ -161,7 +161,9 @@ ResourceAccess::ResourceAccess(const QByteArray &resourceName, QObject *parent)
 
 ResourceAccess::~ResourceAccess()
 {
-
+    if (!d->resultHandler.isEmpty()) {
+        Warning() << "Left jobs running while shutting down ResourceAccess";
+    }
 }
 
 QByteArray ResourceAccess::resourceName() const
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index dc7640d..c16a9d2 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -46,6 +46,10 @@ public:
     Async::Job<void> sendCommand(int commandId);
     Async::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb);
     Async::Job<void> synchronizeResource(bool remoteSync, bool localSync);
+    /**
+     * Tries to connect to server, and returns a connected socket on success.
+     */
+    static Async::Job<QSharedPointer<QLocalSocket> > connectToServer(const QByteArray &identifier);
 
 public Q_SLOTS:
     void open();