PlayerThread: make chunk allocation error non-fatal in SendSilence()

Fixes abort after seeking on fast machines.

PlayerThread: make chunk allocation error non-fatal in SendSilence()
5eb0cbc8 · Max Kellermann · ba8e579e · 5eb0cbc8 · 5eb0cbc8
Commit 5eb0cbc8 authored Jul 05, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

NEWS NEWS +1 -0

PlayerThread.cxx src/PlayerThread.cxx +6 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.17 (not yet released)
+* fix spurious seek error "Failed to allocate silence buffer"
 * replay gain: fix "replay_gain_handler mixer" setting

 ver 0.19.16 (2016/06/13)

--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -486,8 +486,12 @@ Player::SendSilence()

 	MusicChunk *chunk = buffer.Allocate();
 	if (chunk == nullptr) {
-		LogError(player_domain, "Failed to allocate silence buffer");
-		return false;
+		/* this is non-fatal, because this means that the
+		   decoder has filled to buffer completely meanwhile;
+		   by ignoring the error, we work around this race
+		   condition */
+		LogDebug(player_domain, "Failed to allocate silence buffer");
+		return true;
 	}

 #ifndef NDEBUG