summaryrefslogtreecommitdiffstats
path: root/apps/onplay.c
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-04-11 01:32:53 +0200
committerChristian Soffke <christian.soffke@gmail.com>2022-11-19 10:01:23 +0100
commit3d34140cfbd63910654fd20e3e90e30de114f5d9 (patch)
tree34c5094e290d5425401c11401d350cbd049555b7 /apps/onplay.c
parent3b1230b36592c1f16c8ceb101e7dc1cf263bd260 (diff)
downloadrockbox-3d34140cfb.tar.gz
rockbox-3d34140cfb.zip
Fix return to root after selecting items from playlist viewer
When selecting an item, Rockbox only checked that playback was stopped before entering the viewer and went to the WPS if music had started playing afterwards, but returned to the root menu otherwise The WPS will now be displayed whenever a new item has been selected, even if audio was paused or playing before. boomark_autoload required slight adjustments to its return values, so that the WPS would not be opened after a user cancels out of the bookmark selection screen for a playlist, since it previously returned true in that case, too. Change-Id: I231ea788e2f80fdda5fe4ad4d2420450931f686f
Diffstat (limited to 'apps/onplay.c')
-rw-r--r--apps/onplay.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index 8507699bd3..0bb3b6ae3c 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -588,12 +588,11 @@ static int add_to_playlist(void* arg)
static bool view_playlist(void)
{
- bool was_playing = audio_status() & AUDIO_STATUS_PLAY;
bool result;
result = playlist_viewer_ex(selected_file);
- if (!was_playing && (audio_status() & AUDIO_STATUS_PLAY) &&
+ if (result == PLAYLIST_VIEWER_OK &&
onplay_result == ONPLAY_OK)
/* playlist was started from viewer */
onplay_result = ONPLAY_START_PLAY;