X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.cpp;h=17cf26d349348569c2e8184d57bb9aeb846a2063;hp=438a42a71a753ea922731571ae286ef1950f2222;hb=e14649614fbbf9b386505a5d782b88b1ac313c1f;hpb=33a1a6f1bf47db069acae3eaa88a1aa156342002

diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index 438a42a7..17cf26d3 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -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,