The Monolithic build behaves now like a regular IRC client.

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

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 7b05c73..6173526 100644 (file)
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -26,18 +26,24 @@
 #include "qtui.h"
 
 MonolithicApplication::MonolithicApplication(int &argc, char **argv)
-  : QtUiApplication(argc, argv)
+  : QtUiApplication(argc, argv),
+    _internalInitDone(false)
 {
   _internal = new CoreApplicationInternal(); // needed for parser options
   setRunMode(Monolithic);
 }
 
 bool MonolithicApplication::init() {
-  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
-  if(QtUiApplication::init()) {
-    return true;
+  if(!Quassel::init()) // parse args
+    return false;
+
+  if(isOptionSet("port")) {
+    _internal->init();
+    _internalInitDone = true;
   }
-  return false;
+
+  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
+  return QtUiApplication::init();
 }
 
 MonolithicApplication::~MonolithicApplication() {
@@ -47,13 +53,15 @@ MonolithicApplication::~MonolithicApplication() {
 }
 
 void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
-  connect(syncer, SIGNAL(startInternalCore()), this, SLOT(startInternalCore()));
+  connect(syncer, SIGNAL(startInternalCore(ClientSyncer *)), this, SLOT(startInternalCore(ClientSyncer *)));
 }
 
-void MonolithicApplication::startInternalCore() {
-  _internal->init();
+void MonolithicApplication::startInternalCore(ClientSyncer *syncer) {
+  if(!_internalInitDone) {
+    _internal->init();
+    _internalInitDone = true;
+  }
   Core *core = Core::instance();
-  ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());
   connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
   connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
 }