X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f0fccd51c27b5cbe8990e625a7bdcf9972142d1f..f33ba69e92f389f5884eae5a586858a629a5260b:/terminal.c

diff --git a/terminal.c b/terminal.c
index 3b149234..00fd7c85 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3311,6 +3311,7 @@ void term_out(Terminal *term)
     }
 
     term_print_flush(term);
+    logflush(term->logctx);
 }
 
 #if 0
@@ -3573,8 +3574,9 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    }
 	    tattr |= (tchar & CSET_MASK);
 	    tchar &= CHAR_MASK;
-	    if ((d[1] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
-		    tattr |= ATTR_WIDE;
+	    if (j < term->cols-1 &&
+		(d[1] & (CHAR_MASK | CSET_MASK)) == UCSWIDE)
+		tattr |= ATTR_WIDE;
 
 	    /* Video reversing things */
 	    if (term->selstate == DRAGGING || term->selstate == SELECTED) {