From 6bbb114046f54a85bed6674011411d4d869ef2fb Mon Sep 17 00:00:00 2001 From: David Leadbeater Date: Mon, 30 Jun 2014 00:05:46 +0100 Subject: Remove NO_ACT if we see a user specified hilight In this path we can't look up ignores again because the print text signal doesn't know the nick, etc. Instead just show it. The user can use -actcolor %n or make the hilight more specific if desired. --- src/fe-common/core/hilight-text.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 34c5c643..d4eeb1f3 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -336,6 +336,12 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text, if (!nick_match || (dest->level & MSGLEVEL_HILIGHT)) { /* update the level / hilight info */ hilight_update_text_dest(dest, hilight); + /* Remove NO_ACT, this means explicitly defined hilights will bypass + * /IGNORE ... NO_ACT. + * (It's still possible to use /hilight -actcolor %n to hide + * hilight/beep). + */ + dest->level &= ~MSGLEVEL_NO_ACT; } if (nick_match) -- cgit v1.2.3