From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 6 Nov 2007 10:47:43 +0000 (+0000)
Subject: This should take care of it the clean way. Sput please check (I don't have a compiler... 
X-Git-Tag: 0.1.0~78
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a84b3ab2b92bc8c5ac504e5430eb81d05efc690e

This should take care of it the clean way. Sput please check (I don't have a compiler at hand right now)
---

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;
 }