X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcpparser.cpp;h=1aa8c0ea45b39fa43b54f701623b7a38beb79562;hp=7619a697041826e76f3d9dacb6c41c7f88747d9b;hb=644837b45714e41246a8fd10fc6efc0e129280ff;hpb=5cab348de53cb3b994273c06fe69e1f799d247b4

diff --git a/src/core/ctcpparser.cpp b/src/core/ctcpparser.cpp
index 7619a697..1aa8c0ea 100644
--- a/src/core/ctcpparser.cpp
+++ b/src/core/ctcpparser.cpp
@@ -177,7 +177,8 @@ void CtcpParser::parse(IrcEventRawMessage *e, Message::Type messagetype) {
 
     ctcpcmd = ctcpcmd.toUpper();
 
-    if(!coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
+    // we don't want to block /me messages by the CTCP ignore list
+    if(ctcpcmd == QLatin1String("ACTION") || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
       if(uuid.isNull())
         uuid = QUuid::createUuid();