1 files changed, 7 insertions, 2 deletions

diff --git a/apps/playback.c b/apps/playback.c
index e33a4ac507..fe7b74893a 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1002,8 +1002,13 @@ static void audio_update_trackinfo(void)
     thistrack_id3->elapsed = 0;
 
 #ifdef HAVE_TAGCACHE
-    /* Resume all manually selected tracks if so configured */
-    resume = global_settings.autoresume_enable && !automatic_skip;
+    /* Ignoring resume position for automatic track change if so configured */
+    resume = global_settings.autoresume_enable &&
+        (!automatic_skip     /* Resume all manually selected tracks */
+         || global_settings.autoresume_automatic == AUTORESUME_NEXTTRACK_ALWAYS
+         || (global_settings.autoresume_automatic != AUTORESUME_NEXTTRACK_NEVER
+                                                /* Not never resume? */
+             && autoresumable(thistrack_id3))); /* Pass Resume filter? */
 #endif
 
     if (!resume)