diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-12-23 00:55:01 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-12-23 00:55:01 +0000 |
commit | c993f8c38da0e64762ef2c382f38fcd80cd71ae8 (patch) | |
tree | 1488ea3b6eeb805b36e3e22865f1d444441c51dc /apps | |
parent | e57471a1bed393c1ab8c8560134b2818b4b96ffd (diff) | |
download | rockbox-c993f8c38da0e64762ef2c382f38fcd80cd71ae8.tar.gz rockbox-c993f8c38da0e64762ef2c382f38fcd80cd71ae8.zip |
Now the quick screen properly sorts the playlist when shuffle is disabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8285 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/screens.c b/apps/screens.c index 5c5d96fd44..2cb0fb576a 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -495,7 +495,7 @@ void quick_screen_quick_apply(struct gui_quickscreen *qs) | |||
495 | 495 | ||
496 | bool quick_screen_quick(int button_enter) | 496 | bool quick_screen_quick(int button_enter) |
497 | { | 497 | { |
498 | bool res, oldrepeat; | 498 | bool res, oldrepeat, oldshuffle; |
499 | struct option_select left_option; | 499 | struct option_select left_option; |
500 | struct option_select bottom_option; | 500 | struct option_select bottom_option; |
501 | struct option_select right_option; | 501 | struct option_select right_option; |
@@ -540,13 +540,14 @@ bool quick_screen_quick(int button_enter) | |||
540 | gui_quickscreen_init(&qs, &left_option, &bottom_option, &right_option, | 540 | gui_quickscreen_init(&qs, &left_option, &bottom_option, &right_option, |
541 | (char *)str(LANG_F2_MODE), &quick_screen_quick_apply); | 541 | (char *)str(LANG_F2_MODE), &quick_screen_quick_apply); |
542 | oldrepeat=global_settings.repeat_mode; | 542 | oldrepeat=global_settings.repeat_mode; |
543 | oldshuffle=global_settings.playlist_shuffle; | ||
543 | res=gui_syncquickscreen_run(&qs, button_enter); | 544 | res=gui_syncquickscreen_run(&qs, button_enter); |
544 | if(!res) | 545 | if(!res) |
545 | { | 546 | { |
546 | if ( oldrepeat != global_settings.repeat_mode && | 547 | if ( oldrepeat != global_settings.repeat_mode && |
547 | (audio_status() & AUDIO_STATUS_PLAY) ) | 548 | (audio_status() & AUDIO_STATUS_PLAY) ) |
548 | audio_flush_and_reload_tracks(); | 549 | audio_flush_and_reload_tracks(); |
549 | if(global_settings.playlist_shuffle | 550 | if(oldshuffle != global_settings.playlist_shuffle |
550 | && audio_status() & AUDIO_STATUS_PLAY) | 551 | && audio_status() & AUDIO_STATUS_PLAY) |
551 | { | 552 | { |
552 | #if CONFIG_CODEC == SWCODEC | 553 | #if CONFIG_CODEC == SWCODEC |