diff options
author | Thomas White <taw@bitwiz.org.uk> | 2015-03-11 22:43:42 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2015-04-19 12:31:45 +0200 |
commit | d5ead5c8fa64331bc64f4a85ef3582c87dcd2c7e (patch) | |
tree | 4079ca13e1ecd80938601a4d99d7590f8ed72cf7 /apps/playlist_viewer.c | |
parent | ea334cf650b31cda32066eef2c0541b02270ce98 (diff) | |
download | rockbox-d5ead5c8fa64331bc64f4a85ef3582c87dcd2c7e.tar.gz rockbox-d5ead5c8fa64331bc64f4a85ef3582c87dcd2c7e.zip |
Don't shorten the playlist on shuffle. Fixes FS#13040
Change-Id: Ia482ac8248d831a5364ec7bf4d2ccb7b361d2f05
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index d28643ab20..05b39b4a4e 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -475,8 +475,8 @@ static bool update_playlist(bool force) | |||
475 | } | 475 | } |
476 | 476 | ||
477 | /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. | 477 | /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. |
478 | Returns -1 if USB attached, 0 if no playlist change, and 1 if playlist | 478 | Returns -1 if USB attached, 0 if no playlist change, 1 if playlist |
479 | changed. */ | 479 | changed, 2 if a track was removed from the playlist */ |
480 | static int onplay_menu(int index) | 480 | static int onplay_menu(int index) |
481 | { | 481 | { |
482 | int result, ret = 0; | 482 | int result, ret = 0; |
@@ -533,7 +533,7 @@ static int onplay_menu(int index) | |||
533 | } | 533 | } |
534 | } | 534 | } |
535 | } | 535 | } |
536 | ret = 1; | 536 | ret = 2; |
537 | break; | 537 | break; |
538 | case 3: | 538 | case 3: |
539 | /* move track */ | 539 | /* move track */ |
@@ -818,7 +818,8 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename) | |||
818 | else if (ret_val > 0) | 818 | else if (ret_val > 0) |
819 | { | 819 | { |
820 | /* Playlist changed */ | 820 | /* Playlist changed */ |
821 | gui_synclist_del_item(&playlist_lists); | 821 | if (ret_val == 2) |
822 | gui_synclist_del_item(&playlist_lists); | ||
822 | update_playlist(true); | 823 | update_playlist(true); |
823 | if (viewer.num_tracks <= 0) | 824 | if (viewer.num_tracks <= 0) |
824 | exit = true; | 825 | exit = true; |