1 files changed, 5 insertions, 2 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 78b601eff3..c511629944 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -40,9 +40,10 @@
 static struct playlist_info playlist;
 
 #define QUEUE_FILE ROCKBOX_DIR "/.queue_file"
-#define PLAYLIST_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH*MAX_FILES_IN_DIR)
+#define PLAYLIST_BUFFER_SIZE (&mp3end - &mp3buf[0])
 
-static unsigned char playlist_buffer[PLAYLIST_BUFFER_SIZE];
+static unsigned char* playlist_buffer = mp3buf;
+extern unsigned char mp3buf[],mp3end;
 static int playlist_end_pos = 0;
 
 static char now_playing[MAX_PATH+1];
@@ -655,6 +656,8 @@ void add_indices_to_playlist(void)
 
     store_index = true;
 
+    mpeg_stop();
+    
     while(1)
     {
         if(playlist.in_ram) {