Merge branch 'sles-assert-fix' of git://github.com/tguillem/MPD-1

d54acbcf · Max Kellermann · ba3ff10c · 86613af3 · d54acbcf
Commit d54acbcf authored 5 years ago by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

SlesOutputPlugin.cxx src/output/plugins/sles/SlesOutputPlugin.cxx +3 -2

No files found.
--- a/src/output/plugins/sles/SlesOutputPlugin.cxx
+++ b/src/output/plugins/sles/SlesOutputPlugin.cxx
@@ -322,8 +322,9 @@ SlesOutput::Play(const void *chunk, size_t size)
 	assert(filled < BUFFER_SIZE);
 	cond.wait(lock, [this]{
-		assert(filled == 0);
+		bool ret = n_queued != N_BUFFERS;
-		return n_queued != N_BUFFERS;
+		assert(ret || filled == 0);
+		return ret;
 	});
 	size_t nbytes = std::min(BUFFER_SIZE - filled, size);