oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output_thread: check again if output is open on CANCEL 

When the player thread unpauses, it sends CANCEL to the output thread,
after having checked that the output is still open.  Problem is when
the output thread closes the device before it can process the CANCEL
command - race condition.  This patch adds another "open" check inside
the output thread.
This commit is contained in:
Max Kellermann 2009-10-16 15:09:22 +02:00
parent 6037beabe1
commit 2c908fde1b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -5,6 +5,7 @@ ver 0.15.5 (2009/??/??)
* tags:
- riff, aiff: fixed "limited range" gcc warning
* decoder_thread: change the fallback decoder name to "mad"
* output_thread: check again if output is open on CANCEL
ver 0.15.4 (2009/10/03)

3
src/output_thread.c
View File

@ -257,7 +257,8 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_CANCEL:
ao->chunk = NULL;
ao_plugin_cancel(ao->plugin, ao->data);
if (ao->open)
ao_plugin_cancel(ao->plugin, ao->data);
ao_command_finished(ao);
/* the player thread will now clear our music