X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;fp=src%2Fcore%2Fcorenetwork.cpp;h=0dfb33b75b481bdd5eef685de95ee5aa0546e4f6;hp=8dccbd5dbddd94bcaa6e69d6edf13aff981be6e9;hb=d48c2331b38ae46732ac1ab9f35a3a0b85100f92;hpb=00b029d3947bc751893d735a495b03ea8796e139 diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index 8dccbd5d..0dfb33b7 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -1267,7 +1267,7 @@ void CoreNetwork::retryCapsIndividually() void CoreNetwork::beginCapNegotiation() { - if (!capNegotiationInProgress()) { + if (!capsPendingNegotiation()) { // No capabilities are queued for request, determine the reason why QString capStatusMsg; if (caps().empty()) { @@ -1327,7 +1327,7 @@ void CoreNetwork::beginCapNegotiation() void CoreNetwork::sendNextCap() { - if (capNegotiationInProgress()) { + if (capsPendingNegotiation()) { // Request the next set of capabilities and remove them from the list putRawLine(serverEncode(QString("CAP REQ :%1").arg(takeQueuedCaps()))); }