Fixed possible race conditions.

* Ensure we always create the thread-local event loop before any objects
in the thread are created, and guarantee the done handler is
immediately registered before the query can execute.
* Call the callback on emitter destruction in the worker thread, where
the eventloop lives, instead of the main thread.

With this I can no longer reproduce any deadlocks or memory corruptions
that I used to get occasionally before.

1 files changed, 6 insertions, 8 deletions

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index a98340c..8bb244c 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -5,26 +5,24 @@
 #include "resourcefacade.h"
 #include "log.h"
 #include <QtConcurrent/QtConcurrentRun>
-#define ASYNCINTHREAD
-#ifndef ASYNCINTHREAD
 #include <QTimer>
-#endif
+
+#define ASYNCINTHREAD
 
 namespace async
 {
     void run(const std::function<void()> &runner) {
-#ifndef ASYNCINTHREAD
         auto timer = new QTimer();
         timer->setSingleShot(true);
         QObject::connect(timer, &QTimer::timeout, [runner, timer]() {
             delete timer;
+#ifndef ASYNCINTHREAD
             runner();
-        });
-        timer->start(0);
 #else
-        //TODO use a job that runs in a thread?
-        QtConcurrent::run(runner);
+            QtConcurrent::run(runner);
 #endif
+        });
+        timer->start(0);
     };
 } // namespace async