summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2022-11-19 13:01:49 +0100
committerChristian Soffke <christian.soffke@gmail.com>2022-11-19 13:39:58 +0100
commitb3a464c9d1f70a377a6edf2b7058da0748e842e5 (patch)
treec1ed877c3e287d1b6b475e39275d8cb2057abc3f
parent3d34140cfbd63910654fd20e3e90e30de114f5d9 (diff)
downloadrockbox-b3a464c9d1.tar.gz
rockbox-b3a464c9d1.zip
Playlist Viewer & Catalogue: Go to WPS when ACTION_TREE_WPS is pressed
Change-Id: Id69253beadcc203ea0e2d16e5acc353aee0f6ad4
-rw-r--r--apps/playlist_catalog.c4
-rw-r--r--apps/playlist_viewer.c3
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)
restart:
browse.flags &= ~BROWSE_SELECTED;
- if (rockbox_browse(&browse) == GO_TO_WPS)
+ int browse_ret = rockbox_browse(&browse);
+ if (browse_ret == GO_TO_WPS
+ || (view && browse_ret == GO_TO_PREVIOUS_MUSIC))
result = 0;
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)
else
{
exit = true;
- ret = PLAYLIST_VIEWER_CANCEL;
+ ret = button == ACTION_TREE_WPS ?
+ PLAYLIST_VIEWER_OK : PLAYLIST_VIEWER_CANCEL;
}
break;
}