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

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index d93a8441..a00966d2 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -30,8 +30,8 @@ BasicHandler::BasicHandler(NetworkConnection *parent)
     _networkConnection(parent),
     initDone(false)
 {
-  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
-         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
+         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
 
   connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
          networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
@@ -189,8 +189,10 @@ void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, c
   emit putCmd(cmd, list, prefix);
 }
 
-void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, quint8 flags) {
-  if(target.startsWith('$') || target.startsWith('#'))
+void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
+  IrcChannel *channel = network()->ircChannel(target);
+  if(!channel && (target.startsWith('$') || target.startsWith('#')))
     target = nickFromMask(sender);
+
   emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
 }