From 94f0b55c645564a60277015e9ba790a1b95a4637 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 24 Jun 2002 06:55:20 +0000 Subject: the scroll loop could end up scrolling forever! git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1135 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'firmware/drivers/lcd.c') diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index e77fd56b56..be71c25311 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -933,7 +933,9 @@ void lcd_puts_scroll(int x, int y, char* string ) ch[0] = string[0]; width = 0; for (s->space = 0; - width + lcd_getstringsize(ch, 0, &w, &h) < (LCD_WIDTH - x*8); ) { + string[(int)s->space] && + (width + lcd_getstringsize(ch, 0, &w, &h) < (LCD_WIDTH - x*8)); + ) { width += lcd_getstringsize(ch, 0, &w, &h); ch[0]=string[(int)++s->space]; } -- cgit v1.2.3