X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=44fdc7b4f05cd7aaf98e6768eefacec1b9447f17;hp=d15a594fe81d063a10b5328ef2a76c5e40ed5c59;hb=615c5621f63360ef11c9cc3519c0462d8b5ec85b;hpb=513c0edce6f4c69f16e6a00c144877e8d5940096

diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp
index d15a594f..44fdc7b4 100644
--- a/src/core/corebasichandler.cpp
+++ b/src/core/corebasichandler.cpp
@@ -118,12 +118,14 @@ void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray &param, const
 }
 
 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);
-  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);
 }