diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-15 22:56:11 +0200 |
| commit | 8422402c39d523c8ce9336e9ecf52950f1905bce (patch) | |
| tree | 4c5d3778768890e192685bd9b02f251b9cf85cbf /src/player_thread.c | |
| parent | b5fde6dfa55676560ee8805e8e00bc188a5ad928 (diff) | |
| parent | 9374e0f4454ff5a37f70ce2d6110d5612856a169 (diff) | |
| download | mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.tar.gz mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.tar.xz mpd-8422402c39d523c8ce9336e9ecf52950f1905bce.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/player_thread.c
Diffstat (limited to 'src/player_thread.c')
| -rw-r--r-- | src/player_thread.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/player_thread.c b/src/player_thread.c index 15fc9d235..cf0b9ac8d 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -458,6 +458,8 @@ static bool player_seek_decoder(struct player *player) assert(pc->next_song != NULL); + const unsigned start_ms = song->start_ms; + if (!decoder_lock_is_current_song(dc, song)) { /* the decoder is already decoding the "next" song - stop it and start the previous song again */ @@ -506,7 +508,7 @@ static bool player_seek_decoder(struct player *player) if (where < 0.0) where = 0.0; - if (!dc_seek(dc, where + song->start_ms / 1000.0)) { + if (!dc_seek(dc, where + start_ms / 1000.0)) { /* decoder failure */ player_command_finished(pc); return false; |