projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash if topic has a CarriageReturn
[quassel.git]
/
src
/
common
/
ircuser.cpp
diff --git
a/src/common/ircuser.cpp
b/src/common/ircuser.cpp
index
d7276fd
..
32ff794
100644
(file)
--- a/
src/common/ircuser.cpp
+++ b/
src/common/ircuser.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-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);
{
Q_ASSERT(channel);
if (!_channels.contains(channel)) {
_channels.insert(channel);
- channel->joinIrcUser(this);
+ if (!skip_channel_join)
+ channel->joinIrcUser(this);
}
}
}
}