X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=a63ec55811cf7011f1158fb5b78c998a286ad11f;hp=b6280793486a398ce7c71e565557b6fa543ec681;hb=1eb21546673535f5707aa6346e8c749b928cd772;hpb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;ds=sidebyside

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index b6280793..a63ec558 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -34,6 +34,14 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
 }
 
 bool MonolithicApplication::init() {
+  if(!Quassel::init()) // parse args
+    return false;
+
+  if(isOptionSet("port")) {
+    _internal->init();
+    _internalInitDone = true;
+  }
+
   connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
   return QtUiApplication::init();
 }
@@ -51,6 +59,7 @@ void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
 void MonolithicApplication::startInternalCore() {
   if(!_internalInitDone) {
     _internal->init();
+    _internalInitDone = true;
   }
   Core *core = Core::instance();
   ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());