From 593605f8eeead398dfcf7311e0a30e1398231b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Tue, 25 Jun 2002 14:21:06 +0000
Subject: Working while-playing-screen

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1186 a1c6a512-1295-4272-9138-f99709370657
---
 apps/tree.c     | 11 +++++------
 firmware/mpeg.c |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/tree.c b/apps/tree.c
index b43c1d725d..a071ce73d6 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -358,6 +358,7 @@ bool dirbrowse(char *root)
                 break;
 
             case BUTTON_ON:
+                lcd_stop_scroll();
                 wps_show();
                 restore = true;
                 break;
@@ -370,13 +371,11 @@ bool dirbrowse(char *root)
             numentries = showdir(currdir, start);
             put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
         }
-        else {
-            lcd_stop_scroll();
-            if ( numentries )
-                lcd_puts_scroll(LINE_X, LINE_Y+dircursor,
-                                dircacheptr[start+dircursor]->name);
-        }
 
+        lcd_stop_scroll();
+        if ( numentries )
+            lcd_puts_scroll(LINE_X, LINE_Y+dircursor,
+                            dircacheptr[start+dircursor]->name);
         lcd_update();
     }
 
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 41be070a6e..c21997e701 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -283,12 +283,13 @@ void DEI3(void)
 
             /* will we move across the track boundary? */
             if (( mp3buf_read <= id3tags[0].mempos ) &&
-                ( mp3buf_read + last_dma_chunk_size > id3tags[0].mempos )) {
+                ( (mp3buf_read + last_dma_chunk_size) > id3tags[0].mempos )) {
                 /* shift array so index 0 is current track */
                 int i;
-                for (i=0; i<MAX_ID3_TAGS-1; i++)
+                for (i=0; i<last_tag-1; i++)
                     id3tags[i] = id3tags[i+1];
-                last_tag--;
+                if ( last_tag )
+                    last_tag--;
             }
         }
         else
-- 
cgit v1.2.3