From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 3 Feb 2008 14:30:27 +0000 (+0000)
Subject: fixed the FIXME in Client::networkDestroyed()
X-Git-Tag: 0.2.0-alpha1~132
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=bc0857d740e931b5c8a477ceca1405f7238d6b7a

fixed the FIXME in Client::networkDestroyed()
---

diff --git a/src/client/client.cpp b/src/client/client.cpp
index b3e55c78..6e0baf34 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -356,11 +356,16 @@ void Client::bufferDestroyed() {
 }
 
 void Client::networkDestroyed() {
-  // FIXME this is not gonna work, net is a QObject here already!
   Network *net = static_cast<Network *>(sender());
-  NetworkId networkId = net->networkId();
-  if(_networks.contains(networkId))
-    _networks.remove(networkId);
+  QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
+  while(netIter != _networks.end()) {
+    if(*netIter == net) {
+      netIter = _networks.erase(netIter);
+      break;
+    } else {
+      netIter++;
+    }
+  }
 }
 
 void Client::recvMessage(const Message &msg) {