In flush_reload, don't reset swapwrite if we're still swapping current track. Fixes a silent play bug.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 11f7e60f16..57234fc886 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1675,7 +1675,12 @@ static void mpeg_thread(void)
                     int next = (tag_read_idx+1) & MAX_ID3_TAGS_MASK;
 
                     /* Reset the buffer */
-                    mp3buf_write = mp3buf_swapwrite = id3tags[next]->mempos;
+                    mp3buf_write = id3tags[next]->mempos;
+
+                    /* Reset swapwrite unless we're still swapping current
+                       track */
+                    if (get_unplayed_space() <= get_playable_space())
+                        mp3buf_swapwrite = mp3buf_write;
 
                     close(mpeg_file);
                     remove_all_non_current_tags();