From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 21 Feb 2008 01:07:45 +0000 (+0000)
Subject: Fix nasty bug that made the client sometimes crash at sync.
X-Git-Tag: 0.2.0-alpha1~13
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a2d4978097260c8af1f51ade497071793db2a0c0;ds=sidebyside

Fix nasty bug that made the client sometimes crash at sync.
---

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 601bff03..dfadf321 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -72,23 +72,12 @@ void ClientSyncer::coreHasData() {
       emit loginSuccess();
     } else if(msg["MsgType"] == "SessionInit") {
       sessionStateReceived(msg["SessionState"].toMap());
+      break; // this is definitively the last message we process here!
     } else {
       emit connectionError(tr("<b>Invalid data received from core!</b><br>Disconnecting."));
       disconnectFromCore();
       return;
     }
-    /*
-    if (!msg["StartWizard"].toBool()) {
-    recvCoreState(msg["Reply"]);
-  } else {
-    qWarning("Core not configured!");
-    qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
-    emit showConfigWizard(msg);
-  }
-    blockSize = 0;
-    return;
-  }
-    */
   }
   if(blockSize > 0) {
     emit recvPartialItem(socket->bytesAvailable(), blockSize);
diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 968bf425..e934a05d 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -317,7 +317,7 @@ void SignalProxy::removePeer(QIODevice* iodev) {
     qWarning() << "SignalProxy: unknown QIODevice" << iodev;
     return;
   }
-     
+
   // take a last gasp
   while(true) {
     QVariant var;