diff options
author | Dave Hooper <dave@beermex.com> | 2009-07-02 22:45:00 +0000 |
---|---|---|
committer | Dave Hooper <dave@beermex.com> | 2009-07-02 22:45:00 +0000 |
commit | 4044499198172228dec566782dbe1707f90898a4 (patch) | |
tree | 15695396fd9c0c1d0151529f6a832d7e62d1b5fb | |
parent | bff790d692333fe8e43605682c4a980821e82b53 (diff) | |
download | rockbox-4044499198172228dec566782dbe1707f90898a4.tar.gz rockbox-4044499198172228dec566782dbe1707f90898a4.zip |
Fix playlist viewer behaviour when deleting tracks (one ret had missed being changed to ret_val). FIx playlist viewer behaviour when deleting the only remaining track in playlist (i.e. when audio stops, prevent resume playback also)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21615 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/playlist_viewer.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 961d2cdf12..5fcf9f237c 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -418,10 +418,18 @@ static bool update_playlist(bool force) | |||
418 | /* Reload tracks */ | 418 | /* Reload tracks */ |
419 | viewer.num_tracks = nb_tracks; | 419 | viewer.num_tracks = nb_tracks; |
420 | if (viewer.num_tracks <= 0) | 420 | if (viewer.num_tracks <= 0) |
421 | { | ||
422 | global_status.resume_index = -1; | ||
423 | global_status.resume_offset = -1; | ||
421 | return false; | 424 | return false; |
425 | } | ||
422 | playlist_buffer_load_entries_screen(&viewer.buffer, FORWARD); | 426 | playlist_buffer_load_entries_screen(&viewer.buffer, FORWARD); |
423 | if (viewer.buffer.num_loaded <= 0) | 427 | if (viewer.buffer.num_loaded <= 0) |
428 | { | ||
429 | global_status.resume_index = -1; | ||
430 | global_status.resume_offset = -1; | ||
424 | return false; | 431 | return false; |
432 | } | ||
425 | } | 433 | } |
426 | return true; | 434 | return true; |
427 | } | 435 | } |
@@ -716,7 +724,7 @@ bool playlist_viewer_ex(const char* filename) | |||
716 | ret = true; | 724 | ret = true; |
717 | goto exit; | 725 | goto exit; |
718 | } | 726 | } |
719 | else if (ret > 0) | 727 | else if (ret_val > 0) |
720 | { | 728 | { |
721 | /* Playlist changed */ | 729 | /* Playlist changed */ |
722 | gui_synclist_del_item(&playlist_lists); | 730 | gui_synclist_del_item(&playlist_lists); |