projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make git revision in AboutDlg link to our gitweb
[quassel.git]
/
src
/
common
/
ircchannel.cpp
diff --git
a/src/common/ircchannel.cpp
b/src/common/ircchannel.cpp
index
976375d
..
fd98360
100644
(file)
--- a/
src/common/ircchannel.cpp
+++ b/
src/common/ircchannel.cpp
@@
-137,8
+137,10
@@
void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &
IrcUser *ircuser;
for(int i = 0; i < users.count(); i++) {
ircuser = users[i];
IrcUser *ircuser;
for(int i = 0; i < users.count(); i++) {
ircuser = users[i];
- if(!ircuser || _userModes.contains(ircuser))
+ if(!ircuser || _userModes.contains(ircuser)) {
+ addUserMode(ircuser, modes[i]);
continue;
continue;
+ }
_userModes[ircuser] = modes[i];
ircuser->joinChannel(this);
_userModes[ircuser] = modes[i];
ircuser->joinChannel(this);
@@
-429,7
+431,7
@@
void IrcChannel::removeChannelMode(const QChar &mode, const QString &value) {
return;
case Network::A_CHANMODE:
if(_A_channelModes.contains(mode))
return;
case Network::A_CHANMODE:
if(_A_channelModes.contains(mode))
- _A_channelModes[mode].remove
One
(value);
+ _A_channelModes[mode].remove
All
(value);
break;
case Network::B_CHANMODE:
break;
case Network::B_CHANMODE: