X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.cpp;h=09323067151fbfec4da59e944413a8830933c6f2;hb=877a724cbb82479a3a260cf291a1d46b32cc0fa6;hp=43e1dee110071fc86caca5564c8dd965c4a51f9f;hpb=1a3cdccd4c4465bdb684a4e0927c8431e306c7cc;p=quassel.git

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index 43e1dee1..09323067 100644
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -61,7 +61,7 @@ bool IrcChannel::isKnownUser(IrcUser *ircuser) const
     }
 
     if (!_userModes.contains(ircuser)) {
-        qWarning() << "Channel" << name() << "received data for unknown User" << ircuser->nick();
+        // This can happen e.g. when disconnecting from a network, so don't log a warning
         return false;
     }
 
@@ -180,7 +180,9 @@ void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &
     IrcUser *ircuser;
     for (int i = 0; i < users.count(); i++) {
         ircuser = users[i];
-        if (!ircuser || _userModes.contains(ircuser)) {
+        if (!ircuser)
+            continue;
+        if (_userModes.contains(ircuser)) {
             if (sortedModes[i].count() > 1) {
                 // Multiple modes received, do it one at a time
                 // TODO Better way of syncing this without breaking protocol?