summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-05-29 22:48:54 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-05-29 22:48:54 +0000
commita4d6ad77c4cd5929abee737a86f2e1d7f20ca0d7 (patch)
tree33e6675585644f3884a4c07d85e987536fa3143f /apps
parent7f5ce80932ad33b5a87dea6c52314fd6480db19f (diff)
downloadrockbox-a4d6ad77c4cd5929abee737a86f2e1d7f20ca0d7.tar.gz
rockbox-a4d6ad77c4cd5929abee737a86f2e1d7f20ca0d7.zip
Now the playlist isn't sorted/randomized if no music is playing (fixes the F2-shuffle bug reported by Henry Tremolo)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3707 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/screens.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/screens.c b/apps/screens.c
index 98ac8650d5..d12a93a4d4 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -337,10 +337,13 @@ bool f2_screen(void)
337 global_settings.playlist_shuffle = 337 global_settings.playlist_shuffle =
338 !global_settings.playlist_shuffle; 338 !global_settings.playlist_shuffle;
339 339
340 if (global_settings.playlist_shuffle) 340 if(mpeg_status() & MPEG_STATUS_PLAY)
341 randomise_playlist(current_tick); 341 {
342 else 342 if (global_settings.playlist_shuffle)
343 sort_playlist(true); 343 randomise_playlist(current_tick);
344 else
345 sort_playlist(true);
346 }
344 used = true; 347 used = true;
345 break; 348 break;
346 349