From 594099f1735e4ca92a9cc10d8375e728a72256f1 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 27 Dec 2006 01:51:33 +0000 Subject: [PATCH] Fix fs#6293. Repeat Shuffle will now shuffle the playlist if shuffle is off. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11845 a1c6a512-1295-4272-9138-f99709370657 --- apps/playlist.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/playlist.c b/apps/playlist.c index 27c8676b96..2928db8a4f 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -1033,8 +1033,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps, if (repeat_mode == -1) repeat_mode = global_settings.repeat_mode; - if (repeat_mode == REPEAT_SHUFFLE && - (!global_settings.playlist_shuffle || playlist->amount <= 1)) + if (repeat_mode == REPEAT_SHUFFLE && playlist->amount <= 1) repeat_mode = REPEAT_ALL; steps = calculate_step_count(playlist, steps); @@ -2505,8 +2504,7 @@ int playlist_next(int steps) if (index < 0) { /* end of playlist... or is it */ - if (global_settings.repeat_mode == REPEAT_SHUFFLE && - global_settings.playlist_shuffle && + if (global_settings.repeat_mode == REPEAT_SHUFFLE && playlist->amount > 1) { /* Repeat shuffle mode. Re-shuffle playlist and resume play */