projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
036f2be
)
fixes #940 - Problem with +foo-Channels
author
Marcus Eggenberger
<egs@quassel-irc.org>
Fri, 30 Apr 2010 16:28:04 +0000
(18:28 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 11 May 2010 21:06:41 +0000
(23:06 +0200)
src/core/corebasichandler.cpp
patch
|
blob
|
history
diff --git
a/src/core/corebasichandler.cpp
b/src/core/corebasichandler.cpp
index
d15a594
..
44fdc7b
100644
(file)
--- a/
src/core/corebasichandler.cpp
+++ b/
src/core/corebasichandler.cpp
@@
-118,12
+118,14
@@
void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const
}
void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags) {
}
void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags) {
- if(!target.isEmpty() && network()->prefixes().contains(target[0]))
- target = target.mid(1);
-
IrcChannel *channel = network()->ircChannel(target);
IrcChannel *channel = network()->ircChannel(target);
- if(!channel && (target.startsWith('$') || target.startsWith('#')))
- target = nickFromMask(sender);
+ if(!channel) {
+ if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+ target = target.mid(1);
+
+ if(target.startsWith('$') || target.startsWith('#'))
+ target = nickFromMask(sender);
+ }
emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
}
emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
}