This should not have been recommitted (went undetected for quite a while).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8533 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 6 insertions, 10 deletions

diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 2153b692f3..bf5cdbcdd0 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -842,11 +842,9 @@ static void scroll_thread(void)
                 }
             }
             else {
-                /* pause at beginning of line */
-                if (s->offset >= s->width) {
-                    s->offset = 0;
-                    s->start_tick = current_tick + scroll_delay * 2;
-                }
+                /* scroll forward the whole time */
+                if (s->offset >= s->width)
+                    s->offset %= s->width;
             }
 
             lastmode = drawmode;
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 5d6e0441a2..0b9edf6c99 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -1343,11 +1343,9 @@ static void scroll_thread(void)
                 }
             }
             else {
-                /* pause at beginning of line */
-                if (s->offset >= s->width) {
-                    s->offset = 0;
-                    s->start_tick = current_tick + scroll_delay * 2;
-                }
+                /* scroll forward the whole time */
+                if (s->offset >= s->width)
+                    s->offset %= s->width;
             }
 
             lastmode = drawmode;