From 6b6747cda734de495d835670cb3c5a1de726bbff Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Sun, 15 Apr 2012 17:11:40 -0400 Subject: [PATCH] Fix valgrind error with 1-col char then 2-col char in a 1x1 terminal --- src/terminal/terminal.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/terminal/terminal.cc b/src/terminal/terminal.cc index 18e9cdf..41f2b6b 100644 --- a/src/terminal/terminal.cc +++ b/src/terminal/terminal.cc @@ -60,12 +60,10 @@ void Emulator::print( const Parser::Print *act ) fb.get_mutable_row( -1 )->set_wrap( true ); fb.ds.move_col( 0 ); fb.move_rows_autoscroll( 1 ); - } - - /* wrap 2-cell chars if no room, even without will-wrap flag */ - if ( fb.ds.auto_wrap_mode - && (chwidth == 2) - && (fb.ds.get_cursor_col() == fb.ds.get_width() - 1) ) { + } else if ( fb.ds.auto_wrap_mode + && (chwidth == 2) + && (fb.ds.get_cursor_col() == fb.ds.get_width() - 1) ) { + /* wrap 2-cell chars if no room, even without will-wrap flag */ fb.reset_cell( this_cell ); fb.get_mutable_row( -1 )->set_wrap( false ); /* There doesn't seem to be a consistent way to get the