diff options
| author | Diogo Sousa <diogogsousa@gmail.com> | 2013-11-28 00:59:31 +0000 |
|---|---|---|
| committer | Diogo Sousa <diogogsousa@gmail.com> | 2013-11-28 02:11:33 +0000 |
| commit | 40f26429f8e3466fb68af30076d1a297c84f5da6 (patch) | |
| tree | dcbc904de44ff5284d77e53168fc001c342e218d /src/common/text.c | |
| parent | d38bbb1e2c96314dd61faa84f2908b90ae29b987 (diff) | |
Print{,_attr} and server{,_attr} hooks were incorrectly handled when both
version existed (regular and attrs). Specifically, the priority was not respected, and both versions were run even when EAT_PLUGIN was returned. Fixes #847.
Diffstat (limited to 'src/common/text.c')
| -rw-r--r-- | src/common/text.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/common/text.c b/src/common/text.c index 58d3b45c..1afb0c18 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -2074,8 +2074,6 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d, int i; unsigned int stripcolor_args = (chanopt_is_set (prefs.hex_text_stripcolor_msg, sess->text_strip) ? 0xFFFFFFFF : 0); char tbuf[NICKLEN + 4]; - int eat1; - int eat2; if (prefs.hex_text_color_nicks && (index == XP_TE_CHANACTION || index == XP_TE_CHANMSG)) { @@ -2092,10 +2090,7 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d, for (i = 5; i < PDIWORDS; i++) word[i] = "\000"; - eat1 = plugin_emit_print (sess, word); - eat2 = plugin_emit_print_attrs (sess, word, timestamp); - - if (eat1 || eat2) + if (plugin_emit_print (sess, word, timestamp)) return; /* If a plugin's callback executes "/close", 'sess' may be invalid */ |