Merge branch 'master' into wdk

This commit is contained in:
Berke Viktor
2012-05-04 19:23:07 +02:00
3 changed files with 7 additions and 2 deletions

View File

@@ -265,7 +265,8 @@ fe_set_tab_color (struct session *sess, int col)
sess->nick_said = FALSE;
chan_set_color (sess->res->tab, newdata_list);
if (chan_is_collapsed (sess->res->tab))
if (chan_is_collapsed (sess->res->tab)
&& !(server_sess->msg_said || server_sess->nick_said))
{
server_sess->new_data = TRUE;
server_sess->msg_said = FALSE;
@@ -280,7 +281,7 @@ fe_set_tab_color (struct session *sess, int col)
sess->nick_said = FALSE;
chan_set_color (sess->res->tab, newmsg_list);
if (chan_is_collapsed (sess->res->tab))
if (chan_is_collapsed (sess->res->tab) && !server_sess->nick_said)
{
server_sess->new_data = FALSE;
server_sess->msg_said = TRUE;