aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2007-02-11 20:36:26 +0000
committerWarren Dukes <warren.dukes@gmail.com>2007-02-11 20:36:26 +0000
commitb54c7c64c00dca82a5a1699140ec828343be0cbf (patch)
tree9cd41b36d785998fcc019596b289498e6cf49f61 /src/player.c
parentc5933a164a2b25352becda8b0f103b42bc646348 (diff)
downloadmpd-b54c7c64c00dca82a5a1699140ec828343be0cbf.tar.gz
mpd-b54c7c64c00dca82a5a1699140ec828343be0cbf.tar.xz
mpd-b54c7c64c00dca82a5a1699140ec828343be0cbf.zip
#1) fix a few potential deadlock conditons in decode.c when crossfading is enabled
#2) fix a deadlock condition when attempting to seek if the decoder quit and returned to playerInit() git-svn-id: https://svn.musicpd.org/mpd/trunk@5325 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/player.c')
-rw-r--r--src/player.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/player.c b/src/player.c
index b976dce7f..57ed1f2ef 100644
--- a/src/player.c
+++ b/src/player.c
@@ -138,6 +138,8 @@ int playerInit(void)
decode();
else if (pc->stop)
pc->stop = 0;
+ else if (pc->seek)
+ pc->seek = 0;
else if (pc->pause)
pc->pause = 0;
else if (pc->closeAudio) {