X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f8a28d1f902b5430c33a619094d62ae2f4274f3b..91229c8696c45ee7fe0b73946117f2c1eaaca8c7:/terminal.c

diff --git a/terminal.c b/terminal.c
index 119ecaa9..cf55f8ea 100644
--- a/terminal.c
+++ b/terminal.c
@@ -82,7 +82,7 @@ typedef struct {
 #define poslt(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x < (p2).x ) )
 #define posle(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x <= (p2).x ) )
 #define poseq(p1,p2) ( (p1).y == (p2).y && (p1).x == (p2).x )
-#define posdiff(p1,p2) ( ((p2).y - (p1).y) * (cols+1) + (p2).x - (p1).x )
+#define posdiff(p1,p2) ( ((p1).y - (p2).y) * (cols+1) + (p1).x - (p2).x )
 #define incpos(p) ( (p).x == cols ? ((p).x = 0, (p).y++, 1) : ((p).x++, 0) )
 #define decpos(p) ( (p).x == 0 ? ((p).x = cols, (p).y--, 1) : ((p).x--, 0) )
 
@@ -298,11 +298,12 @@ void term_update(void)
     Context ctx;
     ctx = get_ctx();
     if (ctx) {
+	if (seen_disp_event)
+	    update_sbar();
 	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;
-	    update_sbar();
 	}
 	do_paint(ctx, TRUE);
 	sys_cursor(curs.x, curs.y - disptop);