X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.cpp;h=32ff7944e0f9c0d56b7c8c8b7a7296d0242d0558;hp=543f2b716f0a96293de0c894b6e84b51cc90e9b4;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 543f2b71..32ff7944 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -275,12 +275,13 @@ void IrcUser::updateHostmask(const QString &mask)
 }
 
 
-void IrcUser::joinChannel(IrcChannel *channel)
+void IrcUser::joinChannel(IrcChannel *channel, bool skip_channel_join)
 {
     Q_ASSERT(channel);
     if (!_channels.contains(channel)) {
         _channels.insert(channel);
-        channel->joinIrcUser(this);
+        if (!skip_channel_join)
+            channel->joinIrcUser(this);
     }
 }