Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 16928)
+++ apps/playback.c	(working copy)
@@ -1939,7 +1939,7 @@
     if (new_playlist)
         ci.new_track = 0;
 
-    end_of_playlist = playlist_peek(automatic_skip ? ci.new_track : 0) == NULL;
+    end_of_playlist = !playlist_check(automatic_skip ? ci.new_track : 0);
     auto_dir_skip = end_of_playlist && global_settings.next_folder;
 
     /* If the playlist isn't that big */