player/Thread: cancel audio when decoder startup on seek fails

Fixes assertion failure in MultipleOutputs::Open() after seeking to a failing song during playback.

player/Thread: cancel audio when decoder startup on seek fails
ac7ce735 · Max Kellermann · 4c6619e6 · ac7ce735
Commit ac7ce735 authored Apr 21, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Thread.cxx src/player/Thread.cxx +5 -0

No files found.
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -213,6 +213,11 @@ private:
 	bool WaitDecoderStartup() {
 		while (decoder_starting) {
 			if (!CheckDecoderStartup()) {
+				/* if decoder startup fails, make sure
+				   the previous song is not being
+				   played anymore */
+				pc.outputs.Cancel();
+
 				pc.LockCommandFinished();
 				return false;
 			}