X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=02483d25b6277024cc940731db4371bb5c3b5624;hp=d93a84416bf631ccced4468c1e171e70ee30872d;hb=07922d269c097a809fe20a7cbb605d176c7d3083;hpb=f62cdd391a5e30ef2d2ffbcaa0718904b1652d4e

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index d93a8441..02483d25 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -190,7 +190,9 @@ void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, c
 }
 
 void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, quint8 flags) {
-  if(target.startsWith('$') || target.startsWith('#'))
+  IrcChannel *channel = network()->ircChannel(target);
+  if(!channel && (target.startsWith('$') || target.startsWith('#')))
     target = nickFromMask(sender);
+
   emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
 }