diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-06 22:45:02 +0200 |
| commit | 5c0576ca5519d525c6c383cd138da917b67a2810 (patch) | |
| tree | 08a6f4b78ec2769265bb210e408a46b36f78be61 /src/decoder_thread.c | |
| parent | 4e909f94113360933b77cf9e67ec54649d48665f (diff) | |
| parent | 039b3544902fe479fa2ce31f06de2c08377e0fc5 (diff) | |
| download | mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.gz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.tar.xz mpd-5c0576ca5519d525c6c383cd138da917b67a2810.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/player_control.c
src/player_thread.c
src/playlist_song.c
Diffstat (limited to '')
| -rw-r--r-- | src/decoder_thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c index dbead655d..c2bb655ea 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -380,7 +380,7 @@ decoder_run_song(struct decoder_control *dc, { struct decoder decoder = { .dc = dc, - .initial_seek_pending = song->start_ms > 0, + .initial_seek_pending = dc->start_ms > 0, .initial_seek_running = false, }; int ret; |