summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Leadbeater <dgl@dgl.cx>2014-06-30 00:05:46 +0100
committerDavid Leadbeater <dgl@dgl.cx>2014-06-30 00:32:09 +0100
commit6bbb114046f54a85bed6674011411d4d869ef2fb (patch)
tree423f4712d3c4d4c3836c470ea1457edae96f9340 /src
parentd84811b19230901698a89a5ec89f23d97fc2697b (diff)
downloadirssi-6bbb114046f54a85bed6674011411d4d869ef2fb.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/fe-common/core/hilight-text.c6
1 files changed, 6 insertions, 0 deletions
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)