summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@0x90.dk>2015-04-08 03:32:45 +0200
committerAlexander Færøy <ahf@0x90.dk>2015-04-08 03:32:45 +0200
commit9ffe52ec5e3f0643e7ddd12f4d21c0788d2f8cea (patch)
treec06c683c14eb14b400dddfa45d334c7665931227 /src
parent8d2ea2d7cea464a583a22fe8a6dffb420fbdfe72 (diff)
parentf5331a3df5f06e8ebe389aee7c91a355d5918d7c (diff)
downloadirssi-9ffe52ec5e3f0643e7ddd12f4d21c0788d2f8cea.zip
Merge pull request #233 from dgl/hilight-fix
Make sure NO_ACT isn't cleared when -actcolor %n is used
Diffstat (limited to 'src')
-rw-r--r--src/fe-common/core/hilight-text.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 4b914517..ff3a7085 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -337,14 +337,14 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
old_level = dest->level;
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;
+ /* update the level / hilight info */
+ hilight_update_text_dest(dest, hilight);
}
if (nick_match)