playlist: fixed "next song" check

Check if the "current+1" position is actually valid.

playlist: fixed "next song" check
d9ce8d83 · Vladimir S Eremin · Max Kellermann · e2f22229 · d9ce8d83
Commit d9ce8d83 authored Feb 09, 2009 by Vladimir S Eremin Committed by Max Kellermann Feb 09, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

playlist.c src/playlist.c +2 -3

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -338,12 +338,11 @@ int getPlaylistNextSong(const struct playlist *playlist)
 {
 	if (playlist->current >= 0)
 	{
-		if (queue_length(&playlist->queue) > 1)
+		if (playlist->current + 1 < (int)queue_length(&playlist->queue))
 			return queue_order_to_position(&playlist->queue,
 					       playlist->current + 1);
 		else if (playlist->queue.repeat == 1)
-			return queue_order_to_position(&playlist->queue,
-					       playlist->current);
+			return queue_order_to_position(&playlist->queue, 0);
 	}

 	return -1;