X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=dfadf321664c7a728d8b496d62008d591d17dc21;hb=e8903b1f19c183a537d7b31b7fd709dde1a69ef5;hp=29b4973dbe05b02a50875c94ad3330a1c12e0c5c;hpb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67;p=quassel.git

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 29b4973d..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);
@@ -172,7 +161,7 @@ void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   // Core has accepted our version info and sent its own. Let's see if we accept it as well...
   if(msg["CoreBuild"].toUInt() < Global::coreBuildNeeded) {
     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
-        "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::quasselBuild));
+        "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::coreBuildNeeded));
     disconnectFromCore();
     return;
   }