playlist: removed unreachable "playing" check

In playPlaylist(), the second "song==-1 && playing" check can never be reached, because at this point, the function has already returned (after unpausing).

playlist: removed unreachable "playing" check
5d31e7e7 · Max Kellermann · e5c323fd · 5d31e7e7
Commit 5d31e7e7 authored Jan 23, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 11 deletions

playlist.c src/playlist.c +7 -11

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -703,19 +703,15 @@ enum playlist_result playPlaylist(int song)
 		return PLAYLIST_RESULT_BAD_RANGE;

 	if (playlist.queue.random) {
-		if (song == -1 && playlist.playing) {
-			queue_shuffle_order(&playlist.queue);
-		} else {
-			if (song >= 0)
-				i = queue_position_to_order(&playlist.queue, song);
+		if (song >= 0)
+			i = queue_position_to_order(&playlist.queue, song);

-			if (!playlist.playing)
-				playlist.current = 0;
+		if (!playlist.playing)
+			playlist.current = 0;

-			queue_swap_order(&playlist.queue,
-					 i, playlist.current);
-			i = playlist.current;
-		}
+		queue_swap_order(&playlist.queue,
+				 i, playlist.current);
+		i = playlist.current;
 	}

 	playlist_stopOnError = false;