output_thread: check again if output is open on PAUSE

Basically the same as the 0.15.5 patch "check again if output is open on CANCEL". Same race condition, same fix.

output_thread: check again if output is open on PAUSE
1a6ed811 · Max Kellermann · b2b300b6 · 1a6ed811 · 1a6ed811
Commit 1a6ed811 authored Oct 21, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

NEWS NEWS +1 -0

output_thread.c src/output_thread.c +9 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.6 (2009/??/??)
+* output_thread: check again if output is open on PAUSE


 ver 0.15.5 (2009/10/18)

--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -248,6 +248,15 @@ static gpointer audio_output_task(gpointer arg)
 			break;

 		case AO_COMMAND_PAUSE:
+			if (!ao->open) {
+				/* the output has failed after
+				   audio_output_all_pause() has
+				   submitted the PAUSE command; bail
+				   out */
+				ao_command_finished(ao);
+				break;
+			}
+
 			ao_pause(ao);
 			/* don't "break" here: this might cause
 			   ao_play() to be called when command==CLOSE