Index: drivers/lcd.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd.c,v
retrieving revision 1.90
diff -u -r1.90 lcd.c
--- drivers/lcd.c	26 Aug 2002 10:30:11 -0000	1.90
+++ drivers/lcd.c	27 Aug 2002 17:11:43 -0000
@@ -1284,9 +1284,13 @@
     s->textlen = strlen(string);
 
 
-#if defined(LCD_PROPFONTS) || defined(LOADABLE_FONTS)
+#if defined(LCD_PROPFONTS)
     s->space += 2;
     lcd_getstringsize(string,0,&w,&h);
+    if ( w > LCD_WIDTH - xmargin ) {
+#elif defined(LOADABLE_FONTS)
+    s->space += 2;
+    lcd_getstringsize(string,_font,&w,&h);
     if ( w > LCD_WIDTH - xmargin ) {
 #else
     if ( s->textlen > s->space ) {