From a84b3ab2b92bc8c5ac504e5430eb81d05efc690e Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 6 Nov 2007 10:47:43 +0000 Subject: [PATCH] This should take care of it the clean way. Sput please check (I don't have a compiler at hand right now) --- src/client/client.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index d6f243f4..8bbafb24 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -327,7 +327,6 @@ void Client::syncToCore(const QVariant &coreState) { instance()->connectedToCore = true; updateCoreConnectionProgress(); - emit connected(); // FIXME EgS: moved here from updateCoreConnectionProgress } void Client::updateCoreConnectionProgress() { @@ -381,7 +380,7 @@ void Client::updateCoreConnectionProgress() { } emit coreConnectionProgress(1,1); - //emit connected(); // FIXME EgS: This caused the double backlog... but... we shouldn't be calling this whole function all the time... + emit connected(); // FIXME EgS: This caused the double backlog... but... we shouldn't be calling this whole function all the time... foreach(NetworkInfo *net, networkInfos()) { disconnect(net, 0, this, SLOT(updateCoreConnectionProgress())); @@ -445,9 +444,11 @@ void Client::networkConnected(uint netid) { // FIXME EgS: do we really need to call updateCoreConnectionProgress whenever a new network is connected? NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this); - connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); + if(!isConnected()) { + connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); + connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); + connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); + } connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed())); _networkInfo[netid] = netinfo; } -- 2.20.1