Fixed highlight for DCC, invite and notice: when a window is displaying buffer, there's no highlight

2 files changed, 16 insertions, 7 deletions

diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index fd1a90d5c..dc9f3f843 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -63,10 +63,13 @@ char *dcc_status_string[] =     /* strings for DCC status                   */
 void
 dcc_redraw (int highlight)
 {
-    gui_window_redraw_buffer (gui_buffer_get_dcc (gui_current_window));
-    if (highlight)
+    t_gui_buffer *ptr_buffer;
+
+    ptr_buffer = gui_buffer_get_dcc (gui_current_window);
+    gui_window_redraw_buffer (ptr_buffer);
+    if (highlight && gui_add_hotlist && (ptr_buffer->num_displayed == 0))
     {
-        hotlist_add (highlight, NULL, gui_buffer_get_dcc (gui_current_window), 0);
+        hotlist_add (highlight, NULL, ptr_buffer, 0);
         gui_status_draw (gui_current_window->buffer, 0);
     }
 }
diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 3ef4a2148..c49240f01 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -414,8 +414,11 @@ irc_cmd_recv_invite (t_irc_server *server, char *host, char *nick, char *argumen
                         GUI_COLOR(COLOR_WIN_CHAT),
                         GUI_COLOR(COLOR_WIN_CHAT_NICK),
                         nick);
-            hotlist_add (HOTLIST_HIGHLIGHT, server, server->buffer, 0);
-            gui_status_draw (gui_current_window->buffer, 1);
+            if (gui_add_hotlist && (server->buffer->num_displayed == 0))
+            {
+                hotlist_add (HOTLIST_HIGHLIGHT, server, server->buffer, 0);
+                gui_status_draw (gui_current_window->buffer, 1);
+            }
         }
     }
     else
@@ -1025,8 +1028,11 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *nick, char *argumen
                         (ascii_strcasecmp (nick, "chanserv") != 0) &&
                         (ascii_strcasecmp (nick, "memoserv") != 0))
                     {
-                        hotlist_add (HOTLIST_PRIVATE, server, server->buffer, 0);
-                        gui_status_draw (gui_current_window->buffer, 1);
+                        if (gui_add_hotlist && (server->buffer->num_displayed == 0))
+                        {
+                            hotlist_add (HOTLIST_PRIVATE, server, server->buffer, 0);
+                            gui_status_draw (gui_current_window->buffer, 1);
+                        }
                     }
                 }
             }