In CoreNetwork, directly check the Network::useSasl() function instead
of reaching into networkInfo(). All the other code within CoreNetwork
checks the properties on Network, and useSasl() is already updated
within Network::setNetworkInfo(). This provides consistency with
atomic network information updates.
// Handle special cases first
if (capability == IrcCap::SASL) {
// Only request SASL if it's enabled
// Handle special cases first
if (capability == IrcCap::SASL) {
// Only request SASL if it's enabled
- if (networkInfo().useSasl)
}
else if (IrcCap::knownCaps.contains(capability)) {
// Handling for general known capabilities
}
else if (IrcCap::knownCaps.contains(capability)) {
// Handling for general known capabilities
else {
// No pending desired capabilities, capability negotiation finished
// If SASL requested but not available, print a warning
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,
showMessage(NetworkInternalMessage(
Message::Error,
BufferInfo::StatusBuffer,