From 640e8d899b5ee58b49039be1a2d0660db2482e51 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Wed, 3 Feb 2021 15:49:22 +0100 Subject: [PATCH] Don't scroll one character past the filename end --- Firmware/ultralcd.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f368ff2da..c845c3298 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7105,17 +7105,15 @@ void lcd_sdcard_menu() if (_md->isDir) lcd_print(LCD_STR_FOLDER[0]); for (; i != 0; i--) { - char c = *(_md->scrollPointer + _md->offset +((LCD_WIDTH - ((_md->isDir)?2:1)) - i)); - if (c == '\0') - { + const char* c = (_md->scrollPointer + _md->offset + ((LCD_WIDTH - ((_md->isDir)?2:1)) - i)); + lcd_print(c[0]); + if (c[1]) + _md->lcd_scrollTimer.start(); + else + { _md->lcd_scrollTimer.stop(); break; //stop at the end of the string } - else - { - lcd_print(c); - _md->lcd_scrollTimer.start(); - } } if (i != 0) //adds spaces if string is incomplete or at the end (instead of null). {