Fix flaky scrollbar update when scrollback was reset to bottom.

git-svn-id: svn://svn.tartarus.org/sgt/putty@1275 cda61777-01e9-0310-a592-d414129be87e

diff --git a/terminal.c b/terminal.c
index f238f09..5245cdb 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -319,13 +319,15 @@ void term_update(void)
     Context ctx;
     ctx = get_ctx();
     if (ctx) {
-       if (seen_disp_event)
-           update_sbar();
+       int need_sbar_update = seen_disp_event;
        if ((seen_key_event && (cfg.scroll_on_key)) ||
            (seen_disp_event && (cfg.scroll_on_disp))) {
            disptop = 0;               /* return to main screen */
            seen_disp_event = seen_key_event = 0;
+           need_sbar_update = TRUE;
        }
+       if (need_sbar_update)
+           update_sbar();
        do_paint(ctx, TRUE);
        sys_cursor(curs.x, curs.y - disptop);
        free_ctx(ctx);