X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=d662820c774a8dc4009704dbbc2d495dfa3b1fcd;hp=cacd671cbd78f27ef1f2d99821b618b3eb09eb40;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=fbb06e36ee772862c0d70ab43c9000225e9f8c42

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index cacd671c..d662820c 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -18,33 +18,27 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "core.h"
 #include "coreapplication.h"
 
-
 CoreApplication::CoreApplication(int &argc, char **argv)
     : QCoreApplication(argc, argv)
 {
-#ifdef Q_OS_MAC
-    Quassel::disableCrashHandler();
-#endif /* Q_OS_MAC */
-
-    Quassel::setRunMode(Quassel::CoreOnly);
+    Quassel::registerQuitHandler([this]() {
+        connect(_core.get(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
+        _core->shutdown();
+    });
 }
 
 
-CoreApplication::~CoreApplication()
+void CoreApplication::init()
 {
-    _core.reset();
-    Quassel::destroy();
+    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core->init();
 }
 
 
-bool CoreApplication::init()
+void CoreApplication::onShutdownComplete()
 {
-    if (Quassel::init()) {
-        _core.reset(new Core{}); // FIXME C++14: std::make_unique
-        return _core->init();
-    }
-    return false;
+    connect(_core.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit()));
+    _core.release()->deleteLater();
 }