X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=c0b9a5036d3d88e3d563a9a736e7533f2b9f6207;hp=c06ca6d0067aa69b5c8c4cbbdfbe9de24b5aa6fd;hb=e95dffeaa5d005caa689f8fe34678b95f8fc6736;hpb=a472efdb1d3125358f6c7f5a30c332e6fa395499

diff --git a/src/core/core.cpp b/src/core/core.cpp
index c06ca6d0..c0b9a503 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -84,7 +84,7 @@ void Core::init() {
 }
 
 Core::~Core() {
-  foreach(QTcpSocket *socket, blocksizes.keys()) {
+  foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys();
     socket->disconnectFromHost();  // disconnect local (i.e. non-authed) clients
   }
   qDeleteAll(sessions);
@@ -315,6 +315,7 @@ void Core::clientHasData() {
   while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) {
     QVariantMap msg = item.toMap();
     processClientMessage(socket, msg);
+    if(!blocksizes.contains(socket)) break;  // this socket is no longer ours to handle!
   }
 }