aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-06 22:45:02 +0200
committerMax Kellermann <max@duempel.org>2011-10-06 22:45:02 +0200
commit5c0576ca5519d525c6c383cd138da917b67a2810 (patch)
tree08a6f4b78ec2769265bb210e408a46b36f78be61 /src/player_control.c
parent4e909f94113360933b77cf9e67ec54649d48665f (diff)
parent039b3544902fe479fa2ce31f06de2c08377e0fc5 (diff)
downloadmpd-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 'src/player_control.c')
-rw-r--r--src/player_control.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/player_control.c b/src/player_control.c
index 51420a43f..d8d54dfd6 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -319,9 +319,6 @@ pc_seek(struct player_control *pc, struct song *song, float seek_time)
{
assert(song != NULL);
- if (pc->state == PLAYER_STATE_STOP)
- return false;
-
player_lock(pc);
pc->next_song = song;
pc->seek_where = seek_time;