From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 30 Apr 2010 16:28:04 +0000 (+0200)
Subject: fixes #940 - Problem with +foo-Channels
X-Git-Tag: 0.6.2~15
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e3aac083923ea6a1f13dd8eb6c90da05536d2baf

fixes #940 - Problem with +foo-Channels
---

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