Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 16493)
+++ apps/playback.c	(working copy)
@@ -240,7 +240,6 @@
 /* Track change controls */
 static bool automatic_skip = false; /* Who initiated in-progress skip? (C/A-) */
 static bool playlist_end = false;   /* Has the current playlist ended? (A) */
-static bool auto_dir_skip = false;  /* Have we changed dirs automatically? */
 static bool dir_skip = false;       /* Is a directory skip pending? (A) */
 static bool new_playlist = false;   /* Are we starting a new playlist? (A) */
 static int wps_offset = 0;          /* Pending track change offset, to keep WPS responsive (A) */
@@ -2005,6 +2001,7 @@
     int next_playlist_index;
     bool forward;
     bool end_of_playlist;  /* Temporary flag, not the same as playlist_end */
+    bool auto_dir_skip;    /* Have we changed dirs automatically? */
 
     if (dir_skip)
     {
@@ -2373,15 +2370,10 @@
 
     if (automatic_skip)
     {
-        if (!auto_dir_skip)
-            playlist_next(-wps_offset);
-
         wps_offset = 0;
         automatic_skip = false;
     }
 
-    auto_dir_skip = false;
-
     /* Invalidate prevtrack_id3 */
     prevtrack_id3.path[0] = 0;