Playlist: randomize next song when enabling "random" mode while not playing

Don't restore the current song after shufflung when MPD is stopped (but still remembers the current song internally). Fixes the first part of Mantis ticket 0004005.

Playlist: randomize next song when enabling "random" mode while not playing
e2cc328e · Max Kellermann · 344d10a8 · e2cc328e · e2cc328e
Commit e2cc328e authored Jul 11, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

NEWS NEWS +1 -0

Playlist.cxx src/Playlist.cxx +3 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ ver 0.18.12 (not yet released)
  - audiofile: improve responsiveness
  - audiofile: fix WAV stream playback
  - dsdiff, dsf: fix stream playback
+* randomize next song when enabling "random" mode while not playing

 ver 0.18.11 (2014/05/12)
 * decoder

--- a/src/Playlist.cxx
+++ b/src/Playlist.cxx
@@ -294,7 +294,9 @@ playlist::SetRandom(PlayerControl &pc, bool status)
 	if (queue.random) {
 		/* shuffle the queue order, but preserve current */

-		const int current_position = GetCurrentPosition();
+		const int current_position = playing
+			? GetCurrentPosition()
+			: -1;

 		queue.ShuffleOrder();