iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Respect plugin hook changing tab color

Browse Source 
Fixup to 241dd69b08
This commit is contained in:
Patrick Griffis 2016-11-11 20:02:24 -05:00
parent 241dd69b08
commit 13f6d9265a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/text.c
View File

@ -2009,6 +2009,7 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
char *word[PDIWORDS]; char *word[PDIWORDS];
int i; int i;
tab_state_flags current_state = sess->tab_state; tab_state_flags current_state = sess->tab_state;
tab_state_flags plugin_state = sess->last_tab_state;
unsigned int stripcolor_args = (chanopt_is_set (prefs.hex_text_stripcolor_msg, sess->text_strip) ? 0xFFFFFFFF : 0); unsigned int stripcolor_args = (chanopt_is_set (prefs.hex_text_stripcolor_msg, sess->text_strip) ? 0xFFFFFFFF : 0);
char tbuf[NICKLEN + 4]; char tbuf[NICKLEN + 4];
@ -2029,10 +2030,15 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
/* We want to ignore the tab state if the plugin emits new events /* We want to ignore the tab state if the plugin emits new events
* and restore it if it doesn't eat the current one */ * and restore it if it doesn't eat the current one */
sess->tab_state = sess->last_tab_state; sess->tab_state = plugin_state;
if (plugin_emit_print (sess, word, timestamp)) if (plugin_emit_print (sess, word, timestamp))
return; return;
sess->tab_state = current_state;
/* The plugin may have changed the state which we should respect.
* If the state is NEW_DATA we don't actually know if that was on
* purpose though as print() sets it, so for now we ignore that. FIXME */
if (sess->tab_state == plugin_state || sess->tab_state == TAB_STATE_NEW_DATA)
sess->tab_state = current_state;
/* If a plugin's callback executes "/close", 'sess' may be invalid */ /* If a plugin's callback executes "/close", 'sess' may be invalid */
if (!is_session (sess)) if (!is_session (sess))