1 files changed, 15 insertions, 5 deletions

diff --git a/apps/tagtree.c b/apps/tagtree.c
index 9eef38b5e6..ff364ec5e4 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -330,6 +330,7 @@ static int get_tag(int *tag)
         {"playcount", tag_playcount},
         {"rating", tag_rating},
         {"lastplayed", tag_lastplayed},
+        {"lastelapsed", tag_lastelapsed},
         {"lastoffset", tag_lastoffset},
         {"commitid", tag_commitid},
         {"entryage", tag_virt_entryage},
@@ -841,8 +842,16 @@ static void tagtree_buffer_event(void *data)
  #if CONFIG_CODEC == SWCODEC
     if (autoresume)
     {
-        /* Load current file resume offset if not already defined (by
+        /* Load current file resume info if not already defined (by
            another resume mechanism) */
+        if (id3->elapsed == 0)
+        {
+            id3->elapsed = tagcache_get_numeric(&tcs, tag_lastelapsed);
+
+            logf("tagtree_buffer_event: Set elapsed for %s to %lX\n",
+                 str_or_empty(id3->title), id3->elapsed);
+        }
+
         if (id3->offset == 0)
         {
             id3->offset = tagcache_get_numeric(&tcs, tag_lastoffset);
@@ -940,12 +949,13 @@ static void tagtree_track_finish_event(void *data)
 #if CONFIG_CODEC == SWCODEC
     if (autoresume)
     {
+        unsigned long elapsed = auto_skip ? 0 : id3->elapsed;
         unsigned long offset = auto_skip ? 0 : id3->offset;
-
+        tagcache_update_numeric(tagcache_idx, tag_lastelapsed, elapsed);
         tagcache_update_numeric(tagcache_idx, tag_lastoffset, offset);
 
-        logf("tagtree_track_finish_event: Save offset for %s: %lX",
-             str_or_empty(id3->title), offset);
+        logf("tagtree_track_finish_event: Save resume for %s: %lX %lX",
+             str_or_empty(id3->title), elapsed, offset);
     }
 #endif
 }
@@ -2034,7 +2044,7 @@ static int tagtree_play_folder(struct tree_context* c)
         c->selected_item = 0;
     gui_synclist_select_item(&tree_lists, c->selected_item);
 
-    playlist_start(c->selected_item,0);
+    playlist_start(c->selected_item, 0, 0);
     playlist_get_current()->num_inserted_tracks = 0; /* make warn on playlist erase work */
     return 0;
 }