summary refs log tree commit diff stats
path: root/src/fe-gtk/maingui.c
diff options
context:
space:
mode:
authorBerke Viktor <berkeviktor@aol.com>2012-05-04 19:17:36 +0200
committerBerke Viktor <berkeviktor@aol.com>2012-05-04 19:17:36 +0200
commitcba2e2e3608759ac9434d5c3e3c2629109a1ded8 (patch)
tree1d3cd6ee69a14c78c754e02bc3a43d020f3d2f18 /src/fe-gtk/maingui.c
parent1012be5efbf01597d4edfd8071068286a77ff2dd (diff)
update xchat to r1505
Diffstat (limited to 'src/fe-gtk/maingui.c')
-rw-r--r--src/fe-gtk/maingui.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index ef269f95..8e6873a2 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -317,7 +317,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;
@@ -332,7 +333,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;