From 50207c5b79a3edd1262aa64c0a11479c9712bf03 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Wed, 19 Oct 2016 07:54:31 -0400 Subject: [PATCH] core/playlist: Don't reselect the current playlist We want playback to continue after the queued tracks playlist has run out. Allowing us to select the same playlist multiple times can cause us to get stuck picking the next track. Fixes #100: Finishing "Queued Tracks" playlist shouldn't stop playback Signed-off-by: Anna Schumaker --- core/playlist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/playlist.c b/core/playlist.c index 392521db..297f8d12 100644 --- a/core/playlist.c +++ b/core/playlist.c @@ -52,6 +52,9 @@ bool playlist_select(enum playlist_type_t type, const gchar *name) { if (!playlist_types[type]->pl_can_select(name)) return false; + if ((settings_get(SETTINGS_CUR_TYPE) == type) && + settings_get(SETTINGS_CUR_ID) == playlist_get_id(type, name)) + return true; settings_set(SETTINGS_PREV_TYPE, settings_get(SETTINGS_CUR_TYPE)); settings_set(SETTINGS_PREV_ID, settings_get(SETTINGS_CUR_ID));