playlist: don't preserve "current" song after "random" toggle

When MPD is not playing, it may still remember which is the "current" song. When you switch to "random" mode, MPD will always start playing exactly this song. This defies the goal of "random" mode a little. Clear the "current" song when MPD is not playing during the "random" mode switch.

playlist: don't preserve "current" song after "random" toggle
58a5d308 · Max Kellermann · 9d447dda · 58a5d308
Commit 58a5d308 authored Feb 11, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

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

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -300,7 +300,8 @@ void setPlaylistRandomStatus(struct playlist *playlist, bool status)
 		/* shuffle the queue order, but preserve
 		   playlist->current */

-		int current_position = playlist->current >= 0
+		int current_position =
+			playlist->playing && playlist->current >= 0
 			? (int)queue_order_to_position(&playlist->queue,
 						       playlist->current)
 			: -1;
@@ -316,7 +317,8 @@ void setPlaylistRandomStatus(struct playlist *playlist, bool status)
 							current_position);
 			queue_swap_order(&playlist->queue, 0, current_order);
 			playlist->current = 0;
-		}
+		} else
+			playlist->current = -1;
 	} else
 		orderPlaylist(playlist);