1 files changed, 27 insertions, 4 deletions

diff --git a/akonadish/state.cpp b/akonadish/state.cpp
index 968c0ac..c9f9ee3 100644
--- a/akonadish/state.cpp
+++ b/akonadish/state.cpp
@@ -19,10 +19,13 @@
 
 #include "state.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 #include <QEventLoop>
 #include <QTextStream>
 
+static bool s_hasEventLoop = false;
+
 class State::Private
 {
 public:
@@ -31,8 +34,17 @@ public:
     {
     }
 
+    QEventLoop *eventLoop()
+    {
+        if (!event) {
+            event = new QEventLoop;
+        }
+
+        return event;
+    }
+
     int debugLevel = 0;
-    QEventLoop eventLoop;
+    QEventLoop *event = 0;
     QTextStream outStream;
 };
 
@@ -76,8 +88,10 @@ unsigned int State::debugLevel() const
 
 int State::commandStarted() const
 {
-    if (!d->eventLoop.isRunning()) {
-        return d->eventLoop.exec();
+    if (!s_hasEventLoop) {
+        return QCoreApplication::exec();
+    } else if (!d->eventLoop()->isRunning()) {
+        return d->eventLoop()->exec();
     }
 
     return 0;
@@ -85,6 +99,15 @@ int State::commandStarted() const
 
 void State::commandFinished(int returnCode) const
 {
-    d->eventLoop.exit(returnCode);
+    if (!s_hasEventLoop) {
+        QCoreApplication::exit(returnCode);
+    } else {
+        d->eventLoop()->exit(returnCode);
+    }
+}
+
+void State::setHasEventLoop(bool evented)
+{
+    s_hasEventLoop = evented;
 }