X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=bc7b848a57aa3b342fb12ade666a75d171d408f6;hp=21415aed8ec94b82d485478e4986e9b9027b11e9;hb=f6b9eeda207d42c99fc3e9085631722cf2ec83dc;hpb=2a00e8f57d66d9913a10c30408b89676a74010a1 diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index 21415aed..bc7b848a 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -29,6 +29,7 @@ #include "userinputhandler.h" #include "ctcphandler.h" +INIT_SYNCABLE_OBJECT(CoreNetwork) CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session) : Network(networkid, session), _coreSession(session), @@ -70,7 +71,6 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session) connect(&_autoWhoTimer, SIGNAL(timeout()), this, SLOT(sendAutoWho())); connect(&_autoWhoCycleTimer, SIGNAL(timeout()), this, SLOT(startAutoWhoCycle())); connect(&_tokenBucketTimer, SIGNAL(timeout()), this, SLOT(fillBucketAndProcessQueue())); - connect(this, SIGNAL(connectRequested()), this, SLOT(connectToIrc())); connect(&socket, SIGNAL(connected()), this, SLOT(socketInitialized())); connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); @@ -650,7 +650,7 @@ void CoreNetwork::requestConnect() const { qWarning() << "Requesting connect while already being connected!"; return; } - Network::requestConnect(); + QMetaObject::invokeMethod(const_cast(this), "connectToIrc", Qt::QueuedConnection); } void CoreNetwork::requestDisconnect() const {