diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playlist.c | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index b73aaa85c7..76ce81b51a 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -253,7 +253,7 @@ int play_list(char *dir, /* "current directory" */ | |||
253 | /* now shuffle around the indices */ | 253 | /* now shuffle around the indices */ |
254 | randomise_playlist( random_seed ); | 254 | randomise_playlist( random_seed ); |
255 | 255 | ||
256 | if(!shuffled_index) { | 256 | if(!shuffled_index && global_settings.play_selected) { |
257 | /* The given index was for the unshuffled list, so we need | 257 | /* The given index was for the unshuffled list, so we need |
258 | to figure out the index AFTER the shuffle has been made. | 258 | to figure out the index AFTER the shuffle has been made. |
259 | We scan for the seek position we remmber from before. */ | 259 | We scan for the seek position we remmber from before. */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index cc5ff3c127..d40263cd00 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -59,6 +59,12 @@ static Menu shuffle(void) | |||
59 | } | 59 | } |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | static Menu play_selected(void) | ||
63 | { | ||
64 | set_bool( "Play Selected", &global_settings.play_selected ); | ||
65 | return MENU_OK; | ||
66 | } | ||
67 | |||
62 | static Menu mp3_filter(void) | 68 | static Menu mp3_filter(void) |
63 | { | 69 | { |
64 | set_bool( "Music Filter", &global_settings.mp3filter ); | 70 | set_bool( "Music Filter", &global_settings.mp3filter ); |
@@ -206,6 +212,7 @@ Menu playback_settings_menu(void) | |||
206 | #ifndef HAVE_RECORDER_KEYPAD | 212 | #ifndef HAVE_RECORDER_KEYPAD |
207 | { "Shuffle", shuffle }, | 213 | { "Shuffle", shuffle }, |
208 | #endif | 214 | #endif |
215 | { "Play Selected", play_selected }, | ||
209 | { "Resume", resume }, | 216 | { "Resume", resume }, |
210 | { "FF/RW Min Step", ff_rewind_min_step }, | 217 | { "FF/RW Min Step", ff_rewind_min_step }, |
211 | { "FF/RW Accel", ff_rewind_accel }, | 218 | { "FF/RW Accel", ff_rewind_accel }, |
@@ -336,4 +343,3 @@ Menu settings_menu(void) | |||
336 | menu_exit(m); | 343 | menu_exit(m); |
337 | return result; | 344 | return result; |
338 | } | 345 | } |
339 | |||