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

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index cacd671c..50670ea9 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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();
-    Quassel::destroy();
+    _core = std::make_unique<Core>();
+    _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(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
+    _core.release()->deleteLater();
 }