X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=79433b9471b8e15c93fffc74a4c6ea2174de3b9f;hp=6f201744e96b61b059a92a04b0f99c475450aaf1;hb=b84f31a79b8cc8b69db7b21723493224334575b6;hpb=cb8ba3dbdb3402159694f9f299a8d931ca4bbdc4

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 6f201744..79433b94 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -394,8 +394,10 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     QVariantMap reply;
 
     // Just version information -- check it!
-    if((msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732)
-       || (!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol)) {
+    uint ver = 0;
+    if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy
+    if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt();
+    if(ver < Global::coreNeedsProtocol) {
       reply["MsgType"] = "ClientInitReject";
       reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
       "This core needs at least client/core protocol version %1.<br>"