Index: apps/plugins/pictureflow.c
===================================================================
--- apps/plugins/pictureflow.c	(Revision 18359)
+++ apps/plugins/pictureflow.c	(Arbeitskopie)
@@ -459,7 +459,7 @@
     /* now fix the track list order */
     l = 0;
     track_count = 0;
-    while (l < heighest_index && 
+    while (l <= heighest_index && 
            string_index <  MAX_TRACKS*AVG_TRACK_NAME_LENGTH)
     {
         if (temp_titles[l][0] != '\0')
@@ -2095,8 +2095,10 @@
 #endif
 
         case PICTUREFLOW_SELECT_ALBUM:
-            if ( pf_state == pf_idle )
+            if ( pf_state == pf_idle ) {
+                start_index_track_list = 0;
                 pf_state = pf_cover_in;
+            }
             if ( pf_state == pf_show_tracks )
                 pf_state = pf_cover_out;
             break;