X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=9b7f5b65965c5f2410cb22df72ac132fc83bff87;hp=830a79b15bc7b2a241dd3eedfcdb0ac7d1fbd44f;hb=3af9d3aeccfac1218ad3342434e5fda0c4ad1266;hpb=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 830a79b1..9b7f5b65 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -63,7 +63,7 @@ Core::Core() : storage(0) {
     exit(1); // TODO make this less brutal (especially for mono client -> popup)
   }
   connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage()));
-  _storageSyncTimer.start(10 * 60 * 1000); // in msecs
+  _storageSyncTimer.start(10 * 60 * 1000); // 10 minutes
 }
 
 void Core::init() {
@@ -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++;
     }
   }