X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=e0b502b69dd59ed23ae262993f6c7529fba80451;hp=93d73bb6889d991a3133f0b1a068cca557c24781;hb=d4b7af7050bac6f894a05bff4eab1becaffa27ce;hpb=c8f0fad36b10552494f8ec3c3a45b52a3f0d2663 diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index 93d73bb6..e0b502b6 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -186,8 +186,8 @@ void ClientSyncer::coreSocketDisconnected() { 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.contains("CoreBuild") && msg["CoreBuild"].toUInt() < 732 // legacy! - || !msg.contains("CoreBuild") && msg["ProtocolVersion"].toUInt() < Global::clientNeedsProtocol) { + if((msg.contains("CoreBuild") && msg["CoreBuild"].toUInt() < 732) // legacy! + || (!msg.contains("CoreBuild") && msg["ProtocolVersion"].toUInt() < Global::clientNeedsProtocol)) { emit connectionError(tr("The Quassel Core you are trying to connect to is too old!
" "Need at least core/client protocol v%1 to connect.").arg(Global::clientNeedsProtocol)); disconnectFromCore(); @@ -346,7 +346,8 @@ void ClientSyncer::ircUserRemoved(QObject *user) { } void ClientSyncer::checkSyncState() { - if(usersToSync.count() + channelsToSync.count() + netsToSync.count() == 0) { + // if(usersToSync.count() + channelsToSync.count() + netsToSync.count() == 0) { + if(netsToSync.isEmpty()) { // done syncing! /* qDebug() << "done";