X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=3d1a060d6ef7fa8ace88a28c02d6773b578d0caa;hb=e1dc333ae055788dd1a2da86ca72aa126c157697;hp=d6c1bcd29af05c2ad05089e6712a726439945c01;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index d6c1bcd2..3d1a060d 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,25 +32,26 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
 {
     _internal = new CoreApplicationInternal(); // needed for parser options
 #if defined(HAVE_KDE4) || defined(Q_OS_MAC)
-    disableCrashhandler();
+    Quassel::disableCrashHandler();
 #endif /* HAVE_KDE4 || Q_OS_MAC */
-    setRunMode(Quassel::Monolithic);
+
+    Quassel::setRunMode(Quassel::Monolithic);
 }
 
 
 bool MonolithicApplication::init()
 {
-    if (!Quassel::init()) // parse args
+    if (!QtUiApplication::init())
         return false;
 
     connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
 
-    // FIXME what's this for?
-    if (isOptionSet("port")) {
+    // If port is given, start core so it can listen to incoming connections
+    if (Quassel::isOptionSet("port")) {
         startInternalCore();
     }
 
-    return QtUiApplication::init();
+    return true;
 }