diff options
-rw-r--r-- | apps/playlist_catalog.c | 4 | ||||
-rw-r--r-- | apps/playlist_viewer.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index 65a48611c0..01cbc31600 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c | |||
@@ -161,7 +161,9 @@ static int display_playlists(char* playlist, bool view) | |||
161 | 161 | ||
162 | restart: | 162 | restart: |
163 | browse.flags &= ~BROWSE_SELECTED; | 163 | browse.flags &= ~BROWSE_SELECTED; |
164 | if (rockbox_browse(&browse) == GO_TO_WPS) | 164 | int browse_ret = rockbox_browse(&browse); |
165 | if (browse_ret == GO_TO_WPS | ||
166 | || (view && browse_ret == GO_TO_PREVIOUS_MUSIC)) | ||
165 | result = 0; | 167 | result = 0; |
166 | 168 | ||
167 | if (browse.flags & BROWSE_SELECTED) | 169 | if (browse.flags & BROWSE_SELECTED) |
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index e3faf4b68f..5b6e2991bc 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -883,7 +883,8 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename) | |||
883 | else | 883 | else |
884 | { | 884 | { |
885 | exit = true; | 885 | exit = true; |
886 | ret = PLAYLIST_VIEWER_CANCEL; | 886 | ret = button == ACTION_TREE_WPS ? |
887 | PLAYLIST_VIEWER_OK : PLAYLIST_VIEWER_CANCEL; | ||
887 | } | 888 | } |
888 | break; | 889 | break; |
889 | } | 890 | } |