Merge tag 'v0.19.16'

release v0.19.16
2016-06-13 19:03:59 +02:00
parent 021519f295 faf0c950fe
commit 8b903626c2
4 changed files with 17 additions and 4 deletions
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -565,6 +565,8 @@ Player::SeekDecoder()
 {
 	assert(pc.next_song != nullptr);

+	pc.outputs.Cancel();
+
 	const SongTime start_time = pc.next_song->GetStartTime();

 	if (!dc.LockIsCurrentSong(*pc.next_song)) {
@@ -628,8 +630,6 @@ Player::SeekDecoder()
 	/* re-fill the buffer after seeking */
 	buffering = true;

-	pc.outputs.Cancel();
-
 	return true;
 }