X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=9b7f5b65965c5f2410cb22df72ac132fc83bff87;hb=9fcd3d063228a779afae82f015a9067186c3b742;hp=233157bc1fe1540205039758322ac4fdb1d78680;hpb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;p=quassel.git

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 233157bc..9b7f5b65 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -458,17 +458,19 @@ void Core::clientDisconnected() {
     QHash<QTcpSocket *, quint32>::iterator blockSizeIter = blocksizes.begin();
     while(blockSizeIter != blocksizes.end()) {
       if(blockSizeIter.key() == socket) {
-	blocksizes.erase(blockSizeIter);
+	blockSizeIter = blocksizes.erase(blockSizeIter);
+      } else {
+	blockSizeIter++;
       }
-      blockSizeIter++;
     }
 
     QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
     while(clientInfoIter != clientInfo.end()) {
       if(clientInfoIter.key() == socket) {
-	clientInfo.erase(clientInfoIter);
+	clientInfoIter = clientInfo.erase(clientInfoIter);
+      } else {
+	clientInfoIter++;
       }
-      clientInfoIter++;
     }
   }