aboutsummaryrefslogtreecommitdiffstats
path: root/src/playlist_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-07-20 21:46:05 +0200
committerMax Kellermann <max@duempel.org>2011-07-20 21:46:05 +0200
commit0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3 (patch)
treed08d18c852febad9d6da94dfbe31545dcf93b5d0 /src/playlist_control.c
parent57936a13741c09fa54a33a53ed05ac0d996e4807 (diff)
parent838f7cd210dbd3f071d48d54c168c123c3d20c58 (diff)
downloadmpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.gz
mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.xz
mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.zip
Merge branch 'v0.16.x'
Conflicts: src/player_thread.c src/playlist_control.c
Diffstat (limited to 'src/playlist_control.c')
-rw-r--r--src/playlist_control.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/playlist_control.c b/src/playlist_control.c
index df9384a80..998294845 100644
--- a/src/playlist_control.c
+++ b/src/playlist_control.c
@@ -230,10 +230,12 @@ playlist_seek_song(struct playlist *playlist, struct player_control *pc,
playlist->error_count = 0;
if (!playlist->playing || (unsigned)playlist->current != i) {
- /* seeking is not within the current song - first
- start playing the new song */
+ /* seeking is not within the current song - prepare
+ song change */
+
+ playlist->playing = true;
+ playlist->current = i;
- playlist_play_order(playlist, pc, i);
queued = NULL;
}