Event backend porting, mostly WHOIS-related stuff

[quassel.git] / src / core / corebasichandler.cpp

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 &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);
 }