X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=9e7f03fdf0dad8ea5941e85d1a1a82528145b4a5;hp=90f39055f2c7b51b9c462c52216629cc17621efe;hb=55ed2b3b4fac69d7d4bcb62f312b1fd233626577;hpb=493043890c74e4679bb3fdaf512a0e1e52c426d3

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 90f39055..9e7f03fd 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -18,33 +18,25 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "core.h"
 #include "coreapplication.h"
 
-
-CoreApplication::CoreApplication(int &argc, char **argv)
+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(), &Core::shutdownComplete, this, &CoreApplication::onShutdownComplete);
+        _core->shutdown();
+    });
 }
 
-
-CoreApplication::~CoreApplication()
+void CoreApplication::init()
 {
-    _core.reset();
+    _core = std::make_unique<Core>();
+    _core->init();
 }
 
-
-void CoreApplication::init()
+void CoreApplication::onShutdownComplete()
 {
-    if (!Quassel::init()) {
-        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
-    }
-
-    _core.reset(new Core{}); // FIXME C++14: std::make_unique
-    _core->init();
+    connect(_core.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
+    _core.release()->deleteLater();
 }