X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcorenetwork.cpp;h=618aaaec236871d1ffa7ef0615091c8334904b33;hb=HEAD;hp=438a42a71a753ea922731571ae286ef1950f2222;hpb=33a1a6f1bf47db069acae3eaa88a1aa156342002;p=quassel.git diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index 438a42a7..618aaaec 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2020 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -1086,8 +1086,9 @@ void CoreNetwork::serverCapAdded(const QString& capability) // Handle special cases first if (capability == IrcCap::SASL) { // Only request SASL if it's enabled - if (networkInfo().useSasl) + if (useSasl()) { queueCap(capability); + } } else if (IrcCap::knownCaps.contains(capability)) { // Handling for general known capabilities @@ -1367,7 +1368,7 @@ void CoreNetwork::sendNextCap() else { // No pending desired capabilities, capability negotiation finished // If SASL requested but not available, print a warning - if (networkInfo().useSasl && !capEnabled(IrcCap::SASL)) + if (useSasl() && !capEnabled(IrcCap::SASL)) showMessage(NetworkInternalMessage( Message::Error, BufferInfo::StatusBuffer,