X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=603d291ff7096c7366fc87076379fbe4d74cc00e;hb=2e80003ab40313767d0624e05533a62e2eee387b;hp=3fd539ea6e905702497dbaf3f1a0823fa9dc9876;hpb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 3fd539ea..603d291f 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -405,7 +405,7 @@ void CoreSession::createIdentity(const Identity &identity, const QVariantMap &ad
 void CoreSession::createIdentity(const CoreIdentity &identity) {
   CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
   _identities[identity.id()] = coreIdentity;
-  // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+  // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
   coreIdentity->synchronize(signalProxy());
   connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender()));
   emit identityCreated(*coreIdentity);
@@ -481,7 +481,10 @@ void CoreSession::removeNetwork(NetworkId id) {
     return;
 
   if(net->connectionState() != Network::Disconnected) {
-    connect(net, SIGNAL(disconnected(NetworkId)), SLOT(destroyNetwork(NetworkId)));
+    // make sure we no longer receive data from the tcp buffer
+    disconnect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), this, 0);
+    disconnect(net, SIGNAL(displayStatusMsg(QString)), this, 0);
+    connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
     net->disconnectFromIrc();
   } else {
     destroyNetwork(id);
@@ -492,6 +495,16 @@ void CoreSession::destroyNetwork(NetworkId id) {
   QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
   Network *net = _networks.take(id);
   if(net && Core::removeNetwork(user(), id)) {
+    // make sure that all unprocessed RawMessages from this network are removed
+    QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+    while(messageIter != _messageQueue.end()) {
+      if(messageIter->networkId == id) {
+        messageIter = _messageQueue.erase(messageIter);
+      } else {
+        messageIter++;
+      }
+    }
+    // remove buffers from syncer
     foreach(BufferId bufferId, removedBuffers) {
       _bufferSyncer->removeBuffer(bufferId);
     }