From 44f57d35bcd6178a2d3db3b09921bd15359185b9 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Thu, 3 Jul 2008 16:34:33 +0200 Subject: [PATCH] Fix "more" indicator when filters are enabled with some lines hidden (bug #23752) --- src/gui/curses/gui-curses-chat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 9f1a8e480..f2453b5f6 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -752,7 +752,7 @@ gui_chat_display_time_and_prefix (struct t_gui_window *window, * if simulate == 1, nothing is displayed * (for counting how many lines would have been * displayed) - * returns: number of lines displayed (or simulated) + * return number of lines displayed (or simulated) */ int @@ -766,6 +766,9 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, char *ptr_data, *ptr_end_offset, *next_char; char *ptr_style; + if (!line) + return 0; + if (simulate) { x = window->win_chat_cursor_x; @@ -1151,7 +1154,7 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase) /* if so, disable scroll indicator */ if (!ptr_line && ptr_win->scroll) { - if (count == gui_chat_display_line (ptr_win, ptr_win->buffer->last_line, 0, 1)) + if (count == gui_chat_display_line (ptr_win, gui_chat_get_last_line_displayed (ptr_win->buffer), 0, 1)) ptr_win->scroll = 0; }