X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=ca0f5273310cfe3b6a674be1a68257bfe718fe6c;hp=99fcfd80c1477205cca6f877a5f1083cd4d43958;hb=a454ca7a22c1b3d9faf1f0fb8b1c9d7d0aa7847c;hpb=965183188ee726036685fcba379c2559bd183247;ds=sidebyside

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 99fcfd80..ca0f5273 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -52,8 +52,12 @@ bool CoreApplicationInternal::init() {
   Core::instance();  // create and init the core
   _coreCreated = true;
 
+#ifdef HAVE_KDE
   // if using KDE, option is called "restore" instead of "norestore"
-  if(Quassel::isOptionSet("restore") || !Quassel::isOptionSet("norestore"))
+  if(Quassel::isOptionSet("restore"))
+#else
+  if(!Quassel::isOptionSet("norestore"))
+#endif
     Core::restoreState();
 
   return true;
@@ -63,16 +67,14 @@ bool CoreApplicationInternal::init() {
 
 CoreApplication::CoreApplication(int &argc, char **argv)
 #ifdef HAVE_KDE
-  : KApplication(false),
+: KApplication(false), Quassel() {
+  Q_UNUSED(argc); Q_UNUSED(argv);
 #else
-  : QCoreApplication(argc, argv),
+: QCoreApplication(argc, argv), Quassel() {
 #endif
-    Quassel()
-{
+
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
-
-  qInstallMsgHandler(Logger::logMessage);
 }
 
 CoreApplication::~CoreApplication() {
@@ -80,7 +82,9 @@ CoreApplication::~CoreApplication() {
 }
 
 bool CoreApplication::init() {
-  if(Quassel::init())
-    return _internal->init();
+  if(Quassel::init() && _internal->init()) {
+    qInstallMsgHandler(Logger::logMessage);
+    return true;
+  }
   return false;
 }