Monolithic build features now zero setup configuration: click and run

[quassel.git] / src / qtui / monoapplication.cpp

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index b628079..a63ec55 100644 (file)
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -34,6 +34,14 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
 }
 
 bool MonolithicApplication::init() {
 }
 
 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();
 }
   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();
 void MonolithicApplication::startInternalCore() {
   if(!_internalInitDone) {
     _internal->init();

+    _internalInitDone = true;

   }
   Core *core = Core::instance();
   ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());
   }
   Core *core = Core::instance();
   ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());